Mercurial > public > mercurial-scm > hg

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- 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