Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 18781:99b78269a2ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: allow (re-)activating a bookmark on the current changeset Allow a bookmark that points to the current changeset to be made the active bookmark without requiring --force. Previously, this would've aborted with: abort: bookmark 'Z' already exists (use -f to force)
author Kevin Bullock <kbullock@ringworld.org>
date Sat, 16 Mar 2013 21:36:44 -0500
parents 56dd55da2f7d
children 22f87dc77604
line wrap: on
line diff
--- 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: