Mercurial > hg-stable
changeset 20233:410193f11422
commands.bookmarks: pass cur in explicitly to checkconflict
cur will be moved inside the wlock in a future patch, so we need to pass it
into checkconflict explicitly.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Thu, 21 Nov 2013 17:11:04 -0800 |
| parents | 5fe4c1a9dc34 |
| children | 8a133190da89 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Nov 19 12:33:14 2013 -0800 +++ b/mercurial/commands.py Thu Nov 21 17:11:04 2013 -0800 @@ -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: @@ -883,7 +883,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) @@ -902,7 +902,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)