Comments
Patch
@@ -811,6 +811,9 @@ def bookmark(ui, repo, mark=None, rev=No
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:
@@ -287,6 +287,11 @@ forward bookmark to descendant without -
$ hg bookmark Z
moving bookmark 'Z' forward from f7b1eb17ad24
+activate bookmark on working dir parent without --force
+
+ $ hg bookmark --inactive Z
+ $ hg bookmark Z
+
list bookmarks
$ hg bookmark