Mercurial > hg-stable
changeset 18782:22f87dc77604
bookmarks: moving the active bookmark deactivates it
After this change, moving the active bookmark somewhere other than the
current changeset (i.e., with --rev) deactivates it. Previously it would
remain in .hg/bookmarks.current, which seems like a bug.
| author | Kevin Bullock <kbullock@ringworld.org> |
|---|---|
| date | Sat, 16 Mar 2013 22:48:22 -0500 |
| parents | 99b78269a2ec |
| children | b99e62a9b7a2 |
| files | mercurial/commands.py tests/test-bookmarks.t |
| diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sat Mar 16 21:36:44 2013 -0500 +++ b/mercurial/commands.py Sat Mar 16 22:48:22 2013 -0500 @@ -869,6 +869,8 @@ marks[mark] = tgt if not inactive and cur == marks[mark]: bookmarks.setcurrent(repo, mark) + elif cur != tgt and mark == repo._bookmarkcurrent: + bookmarks.setcurrent(repo, None) marks.write() # Same message whether trying to deactivate the current bookmark (-i
--- a/tests/test-bookmarks.t Sat Mar 16 21:36:44 2013 -0500 +++ b/tests/test-bookmarks.t Sat Mar 16 22:48:22 2013 -0500 @@ -280,7 +280,15 @@ force bookmark with existing name $ hg bookmark -f X2 + +force bookmark back to where it was, should deactivate it + $ hg bookmark -fr1 X2 + $ hg bookmarks + X2 1:925d80f479bb + Y 2:db815d6d32e6 + Z 0:f7b1eb17ad24 + x y 2:db815d6d32e6 forward bookmark to descendant without --force @@ -360,7 +368,7 @@ $ hg bookmarks X2 1:925d80f479bb Y 2:db815d6d32e6 - * Z 2:db815d6d32e6 + Z 2:db815d6d32e6 x y 2:db815d6d32e6 activate bookmark on working dir parent without --force