changeset 9645:02f40b2ece3f

commands: use rev from remote repo when updating as part of a pull
author timeless@mozdev.org
date Wed, 21 Oct 2009 12:41:28 +0300
parents c6b721da201b
children 5b001f534452
files mercurial/commands.py
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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):