Mercurial > evolve

diff tests/test-uncommit.t @ 313:47d10459fa24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uncommit: handle bookmarks Extract the bookmarks handling code from amend and share it with uncommit.
author Patrick Mezard <patrick@mezard.eu>
date Tue, 26 Jun 2012 16:12:52 +0200
parents a7b5989d1d92
children ebd286f06879
line wrap: on
line diff
--- a/tests/test-uncommit.t	Tue Jun 26 18:12:31 2012 +0200
+++ b/tests/test-uncommit.t	Tue Jun 26 16:12:52 2012 +0200
@@ -117,6 +117,25 @@
   l
   o
 
+Add a couple of bookmarks
+
+  $ glog --hidden
+  @  3:5eb72dbe0cb4@bar(stable/draft) touncommit
+  |
+  o    2:f63b90038565@default(stable/draft) merge
+  |\
+  | o  1:f15c744d48e8@default(stable/draft) addmore
+  |
+  o  0:07f494440405@default(stable/draft) adda
+  
+  $ hg bookmark -r 2 unrelated
+  $ hg bookmark touncommit-bm
+  $ hg bookmark --inactive touncommit-bm-inactive
+  $ hg bookmarks
+   * touncommit-bm             3:5eb72dbe0cb4
+     touncommit-bm-inactive    3:5eb72dbe0cb4
+     unrelated                 2:f63b90038565
+
 Prepare complicated working directory
 
   $ hg branch foo
@@ -135,6 +154,10 @@
   $ hg uncommit
   abort: nothing to uncommit
   [255]
+  $ hg bookmarks
+   * touncommit-bm             3:5eb72dbe0cb4
+     touncommit-bm-inactive    3:5eb72dbe0cb4
+     unrelated                 2:f63b90038565
 
 Test no matches
 
@@ -205,6 +228,10 @@
   |
   o  0:07f494440405@default(stable/draft) adda
   
+  $ hg bookmarks
+   * touncommit-bm             4:e8db4aa611f6
+     touncommit-bm-inactive    4:e8db4aa611f6
+     unrelated                 2:f63b90038565
   $ hg debugsuccessors
   5eb72dbe0cb4 e8db4aa611f6