Mercurial > hg

diff tests/test-rebase-bookmarks.t @ 18514:2a1fac3650a5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: delete divergent bookmarks on destination (issue3685) Similar to merge, divergent bookmarks are only deleted when the bookmark is on the destination parent.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 30 Jan 2013 16:08:32 -0800
parents 2944a6d35158
children 12de53323e59
line wrap: on
line diff
--- a/tests/test-rebase-bookmarks.t	Wed Jan 30 15:35:00 2013 -0800
+++ b/tests/test-rebase-bookmarks.t	Wed Jan 30 16:08:32 2013 -0800
@@ -56,17 +56,35 @@
   $ cd a1
   $ hg up -q Z
 
+Test deleting divergent bookmarks from dest (issue3685)
+
+  $ hg book -r 3 Z@diverge
+
+... and also test that bookmarks not on dest or not being moved aren't deleted
+
+  $ hg book -r 3 X@diverge
+  $ hg book -r 0 Y@diverge
+
+  $ hg tglog
+  o  3: 'D' bookmarks: W X@diverge Z@diverge
+  |
+  | @  2: 'C' bookmarks: Y Z
+  | |
+  | o  1: 'B' bookmarks: X
+  |/
+  o  0: 'A' bookmarks: Y@diverge
+  
   $ hg rebase -s Y -d 3
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @  3: 'C' bookmarks: Y Z
   |
-  o  2: 'D' bookmarks: W
+  o  2: 'D' bookmarks: W X@diverge
   |
   | o  1: 'B' bookmarks: X
   |/
-  o  0: 'A' bookmarks:
+  o  0: 'A' bookmarks: Y@diverge
   
 Keep bookmarks to the correct rebased changeset