[PATCH 1 of 2] update: don't move the active bookmark if a rev is specified with -r

[Idan Kamara]

# HG changeset patch
# User Idan Kamara <idankk86 at gmail.com>
# Date 1330384075 -7200
# Node ID 95a29d35f47932cef18bcc40cbc7c32bdcf034ba
# Parent  0bb0b9f22cd76281cf8664aae85e2e53c43acd96
update: don't move the active bookmark if a rev is specified with -r

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5720,7 +5720,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