Mercurial > public > mercurial-scm > hg-stable
diff mercurial/localrepo.py @ 6130:516d8ffede7c
Merge with crew-stable
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 16 Feb 2008 12:46:28 +0100 |
parents | 7336aeff1a1d 65340b8231eb |
children | 989467e8e3a9 |
line wrap: on
line diff
--- 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"))