--- a/mercurial/commands.py Mon Jan 30 15:56:35 2012 -0600
+++ b/mercurial/commands.py Mon Jan 30 16:01:54 2012 -0600
@@ -4261,7 +4261,7 @@
def postincoming(ui, repo, modheads, optupdate, checkout):
if modheads == 0:
- return
+ return 1
if optupdate:
movemarkfrom = repo['.'].node()
try:
@@ -4312,7 +4312,8 @@
If SOURCE is omitted, the 'default' path will be used.
See :hg:`help urls` for more information.
- Returns 0 on success, 1 if an update had unresolved files.
+ Returns 0 on success, 1 if no changes found or an update had
+ unresolved files.
"""
source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
other = hg.peer(repo, opts, source)