changeset 6130 | 516d8ffede7c |
parent 6121 | 7336aeff1a1d |
parent 6098 | 65340b8231eb |
child 6139 | 989467e8e3a9 |
--- a/mercurial/localrepo.py Sun Feb 10 08:53:39 2008 +0100 +++ b/mercurial/localrepo.py Sat Feb 16 12:46:28 2008 +0100 @@ -1522,7 +1522,7 @@ self.ui.warn(_("abort: push creates new remote branches!\n")) self.ui.status(_("(did you forget to merge?" " use push -f to force)\n")) - return None, 1 + return None, 0 elif inc: self.ui.warn(_("note: unsynced remote changes!\n"))