Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 19112:23f785b38af3 stable 2.6
bookmarks: fix bug that activated a bookmark even with -r passed
If the current revision was the target revision of -r, then the bookmark would
be active. Test cases have been updated accordingly.
| author | Sean Farley <sean.michael.farley@gmail.com> |
|---|---|
| date | Wed, 01 May 2013 15:24:21 -0500 |
| parents | 6439d78e14fb |
| children | 5b1835485442 12dbdd348bb0 |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Apr 30 21:12:49 2013 -0500 +++ b/mercurial/commands.py Wed May 01 15:24:21 2013 -0500 @@ -880,7 +880,7 @@ tgt = scmutil.revsingle(repo, rev).node() checkconflict(repo, mark, force, tgt) marks[mark] = tgt - if not inactive and cur == marks[mark]: + if not inactive and cur == marks[mark] and not rev: bookmarks.setcurrent(repo, mark) elif cur != tgt and mark == repo._bookmarkcurrent: bookmarks.setcurrent(repo, None)