# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 1203097472 7200
# Node ID 65340b8231ebce7b015beaf094ae22fba6ceaffb
# Parent  28054773438cc31fa91de5501c43b086507a2882
push: exit(1) if "push creates new remote branches!"

diff -r 28054773438c -r 65340b8231eb mercurial/localrepo.py
--- a/mercurial/localrepo.py	Wed Feb 13 18:37:38 2008 -0200
+++ b/mercurial/localrepo.py	Fri Feb 15 15:44:32 2008 -0200
@@ -1433,7 +1433,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"))
 
diff -r 28054773438c -r 65340b8231eb tests/test-push-warn.out
--- a/tests/test-push-warn.out	Wed Feb 13 18:37:38 2008 -0200
+++ b/tests/test-push-warn.out	Fri Feb 15 15:44:32 2008 -0200
@@ -33,7 +33,7 @@
 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 @@
 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