Comments
Patch
@@ -818,7 +818,7 @@
scmutil.checknewlabel(repo, mark, 'bookmark')
return mark
- def checkconflict(repo, mark, force=False, target=None):
+ def checkconflict(repo, mark, cur, force=False, target=None):
if mark in marks and not force:
if target:
if marks[mark] == target and target == cur:
@@ -881,7 +881,7 @@
mark = checkformat(names[0])
if rename not in marks:
raise util.Abort(_("bookmark '%s' does not exist") % rename)
- checkconflict(repo, mark, force)
+ checkconflict(repo, mark, cur, force)
marks[mark] = marks[rename]
if repo._bookmarkcurrent == rename and not inactive:
bookmarks.setcurrent(repo, mark)
@@ -900,7 +900,7 @@
tgt = cur
if rev:
tgt = scmutil.revsingle(repo, rev).node()
- checkconflict(repo, mark, force, tgt)
+ checkconflict(repo, mark, cur, force, tgt)
marks[mark] = tgt
if not inactive and cur == marks[newact] and not rev:
bookmarks.setcurrent(repo, newact)