equal
deleted
inserted
replaced
1525 newheads.append(r) |
1525 newheads.append(r) |
1526 if len(newheads) > len(remote_heads): |
1526 if len(newheads) > len(remote_heads): |
1527 warn = 1 |
1527 warn = 1 |
1528 |
1528 |
1529 if warn: |
1529 if warn: |
1530 self.ui.warn(_("abort: push creates new remote branches!\n")) |
1530 self.ui.warn(_("abort: push creates new remote heads!\n")) |
1531 self.ui.status(_("(did you forget to merge?" |
1531 self.ui.status(_("(did you forget to merge?" |
1532 " use push -f to force)\n")) |
1532 " use push -f to force)\n")) |
1533 return None, 0 |
1533 return None, 0 |
1534 elif inc: |
1534 elif inc: |
1535 self.ui.warn(_("note: unsynced remote changes!\n")) |
1535 self.ui.warn(_("note: unsynced remote changes!\n")) |