update: don't move the active bookmark if a rev is specified with -r stable
authorIdan Kamara <idankk86@gmail.com>
Tue, 28 Feb 2012 01:07:55 +0200
branchstable
changeset 16189 41bef17e6ad8
parent 16188 6b52963ced73
child 16190 9479c28a22bf
update: don't move the active bookmark if a rev is specified with -r
mercurial/commands.py
--- a/mercurial/commands.py	Mon Feb 27 18:23:18 2012 +0100
+++ b/mercurial/commands.py	Tue Feb 28 01:07:55 2012 +0200
@@ -5701,7 +5701,7 @@
 
     # with no argument, we also move the current bookmark, if any
     movemarkfrom = None
-    if node is None or node == '':
+    if rev is None or node == '':
         movemarkfrom = repo['.'].node()
 
     # if we defined a bookmark, we have to remember the original bookmark name