diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -1433,7 +1433,7 @@ class localrepository(repo.repository): 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")) diff --git a/tests/test-push-warn.out b/tests/test-push-warn.out --- a/tests/test-push-warn.out +++ b/tests/test-push-warn.out @@ -33,7 +33,7 @@ pushing to ../c searching for changes abort: push creates new remote branches! (did you forget to merge? use push -f to force) -0 +1 pushing to ../c searching for changes no changes found @@ -42,12 +42,12 @@ pushing to ../c searching for changes abort: push creates new remote branches! (did you forget to merge? use push -f to force) -0 +1 pushing to ../c searching for changes abort: push creates new remote branches! (did you forget to merge? use push -f to force) -0 +1 pushing to ../c searching for changes adding changesets