Mercurial > public > mercurial-scm > hg
diff tests/test-bookmarks-merge.t @ 21503:10f15e34d86c
update: show message when a bookmark is activated by update
When updating to a bookmark, mention that the bookmark is now
active. This is a reminder that update does not move the
current bookmark if an explicit target is given - instead
it activates that target.
| author | Stephen Lee <sphen.lee@gmail.com> |
|---|---|
| date | Thu, 07 Mar 2013 14:17:56 +1100 |
| parents | ca275f7ec576 |
| children | 8197b395710e |
line wrap: on
line diff
--- a/tests/test-bookmarks-merge.t Tue Apr 22 10:01:22 2014 -0700 +++ b/tests/test-bookmarks-merge.t Thu Mar 07 14:17:56 2013 +1100 @@ -65,6 +65,7 @@ $ hg up -C e 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + (activating bookmark e) $ hg merge abort: no matching bookmark to merge - please merge with an explicit rev or bookmark (run 'hg heads' to see all heads) @@ -99,6 +100,7 @@ $ hg up -C e 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + (activating bookmark e) $ hg bookmarks b 1:d2ae7f538514 c 3:b8f96cf4688b