Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/commands.py
changeset 18781 99b78269a2ec
parent 18773 56dd55da2f7d
child 18782 22f87dc77604 
--- a/mercurial/commands.py	Sat Mar 16 21:21:54 2013 -0500
+++ b/mercurial/commands.py	Sat Mar 16 21:36:44 2013 -0500
@@ -811,6 +811,9 @@
     def checkconflict(repo, mark, force=False, target=None):
         if mark in marks and not force:
             if target:
+                if marks[mark] == target and target == cur:
+                    # re-activating a bookmark
+                    return
                 anc = repo.changelog.ancestors([repo[target].rev()])
                 bmctx = repo[marks[mark]]
                 if bmctx.rev() in anc:
Mercurial