comparison mercurial/commands.py @ 16189:41bef17e6ad8 stable

update: don't move the active bookmark if a rev is specified with -r
author Idan Kamara <idankk86@gmail.com>
date Tue, 28 Feb 2012 01:07:55 +0200
parents 280e834c9d15
children 7c75924a6926
comparison
equal deleted inserted replaced
16188:6b52963ced73 16189:41bef17e6ad8
5699 if rev is None or rev == '': 5699 if rev is None or rev == '':
5700 rev = node 5700 rev = node
5701 5701
5702 # with no argument, we also move the current bookmark, if any 5702 # with no argument, we also move the current bookmark, if any
5703 movemarkfrom = None 5703 movemarkfrom = None
5704 if node is None or node == '': 5704 if rev is None or node == '':
5705 movemarkfrom = repo['.'].node() 5705 movemarkfrom = repo['.'].node()
5706 5706
5707 # if we defined a bookmark, we have to remember the original bookmark name 5707 # if we defined a bookmark, we have to remember the original bookmark name
5708 brev = rev 5708 brev = rev
5709 rev = scmutil.revsingle(repo, rev, rev).rev() 5709 rev = scmutil.revsingle(repo, rev, rev).rev()