Mercurial > hg-stable
changeset 6098:65340b8231eb
push: exit(1) if "push creates new remote branches!"
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Fri, 15 Feb 2008 15:44:32 -0200 |
| parents | 28054773438c |
| children | 37cc79a5727a |
| files | mercurial/localrepo.py tests/test-push-warn.out |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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"))
--- 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