mercurial/commands.py
changeset 26676 71a485130beb
parent 26653 cffc4f7c6c36
child 26683 634666c48b7d
--- a/mercurial/commands.py	Thu Oct 15 00:32:20 2015 +0100
+++ b/mercurial/commands.py	Wed Oct 14 18:03:17 2015 -0500
@@ -6619,7 +6619,9 @@
             ret = hg.update(repo, rev)
 
         if not ret and movemarkfrom:
-            if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
+            if movemarkfrom == repo['.'].node():
+                pass # no-op update
+            elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
                 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
             else:
                 # this can happen with a non-linear update