Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: use rev from remote repo when updating as part of a pull
authortimeless@mozdev.org
Wed, 21 Oct 2009 12:41:28 +0300
changeset 9645 02f40b2ece3f
parent 9644 c6b721da201b
child 9646 5b001f534452
commands: use rev from remote repo when updating as part of a pull
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Wed Oct 21 12:03:14 2009 +0300
+++ b/mercurial/commands.py	Wed Oct 21 12:41:28 2009 +0300
@@ -2308,6 +2308,8 @@
             raise util.Abort(err)
 
     modheads = repo.pull(other, heads=revs, force=opts.get('force'))
+    if checkout:
+        checkout = str(repo.changelog.rev(other.lookup(checkout)))
     return postincoming(ui, repo, modheads, opts.get('update'), checkout)
 
 def push(ui, repo, dest=None, **opts):
Mercurial