Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 22102:fff8e1cec90f
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 11 Aug 2014 11:24:05 -0500 |
parents | c1ca47204590 f72b71ba756b |
children | fd172ba5c64b |
line wrap: on
line diff
--- a/mercurial/commands.py Sat Aug 02 17:04:53 2014 -0700 +++ b/mercurial/commands.py Mon Aug 11 11:24:05 2014 -0500 @@ -5901,7 +5901,7 @@ 'bundle:' + fname) finally: lock.release() - bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch()) + return postincoming(ui, repo, modheads, opts.get('update'), None) @command('^update|up|checkout|co',