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