equal
deleted
inserted
replaced
1520 |
1520 |
1521 if warn: |
1521 if warn: |
1522 self.ui.warn(_("abort: push creates new remote branches!\n")) |
1522 self.ui.warn(_("abort: push creates new remote branches!\n")) |
1523 self.ui.status(_("(did you forget to merge?" |
1523 self.ui.status(_("(did you forget to merge?" |
1524 " use push -f to force)\n")) |
1524 " use push -f to force)\n")) |
1525 return None, 1 |
1525 return None, 0 |
1526 elif inc: |
1526 elif inc: |
1527 self.ui.warn(_("note: unsynced remote changes!\n")) |
1527 self.ui.warn(_("note: unsynced remote changes!\n")) |
1528 |
1528 |
1529 |
1529 |
1530 if revs is None: |
1530 if revs is None: |