Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 16109:cb756482c1aa
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 10 Feb 2012 17:09:23 -0600 |
parents | 5535e66b3016 a3dcc59054ca |
children | 68007f0557de |
line wrap: on
line diff
--- a/mercurial/commands.py Fri Feb 10 13:50:13 2012 +0100 +++ b/mercurial/commands.py Fri Feb 10 17:09:23 2012 -0600 @@ -4276,7 +4276,7 @@ def postincoming(ui, repo, modheads, optupdate, checkout): if modheads == 0: - return 1 + return if optupdate: movemarkfrom = repo['.'].node() try: @@ -4327,8 +4327,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)