Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-topic-stack.t
changeset 2929 06844693bb21
parent 2927 01cf426bd458
child 2936 3a9303b7b648 
--- a/tests/test-topic-stack.t	Wed Sep 13 15:13:51 2017 +0200
+++ b/tests/test-topic-stack.t	Fri Sep 15 15:48:18 2017 +0200
@@ -254,7 +254,7 @@
   $ echo bbb > ddd
   $ hg commit --amend
   $ hg log -G
-  @  7 default {foo} draft c_d
+  @  6 default {foo} draft c_d
   |
   | o  5 default {foo} draft c_f
   | |
@@ -301,7 +301,7 @@
 
   $ hg log -r 'stack()'
   2 default {foo} draft c_c
-  7 default {foo} draft c_d
+  6 default {foo} draft c_d
   4 default {foo} draft c_e
   5 default {foo} draft c_f
 
@@ -322,11 +322,11 @@
   rebasing 4:0f9ac936c87d "c_e"
   rebasing 5:6559e6d93aea "c_f"
   $ hg log -G
-  o  9 default {foo} draft c_f
+  o  8 default {foo} draft c_f
   |
-  o  8 default {foo} draft c_e
+  o  7 default {foo} draft c_e
   |
-  @  7 default {foo} draft c_d
+  @  6 default {foo} draft c_d
   |
   o  2 default {foo} draft c_c
   |
@@ -347,15 +347,15 @@
   $ hg add hhh
   $ hg commit -m c_h
   $ hg log -G
-  @  11 default {foo} draft c_h
+  @  10 default {foo} draft c_h
   |
-  o  10 default {foo} draft c_g
+  o  9 default {foo} draft c_g
   |
-  | o  9 default {foo} draft c_f
+  | o  8 default {foo} draft c_f
   | |
-  | o  8 default {foo} draft c_e
+  | o  7 default {foo} draft c_e
   |/
-  o  7 default {foo} draft c_d
+  o  6 default {foo} draft c_d
   |
   o  2 default {foo} draft c_c
   |
@@ -369,11 +369,11 @@
   $ hg top -l
   ### topic: foo (2 heads)
   ### branch: default
-  t6: c_f
-  t5: c_e
+  t6@ c_h (current)
+  t5: c_g
   t2^ c_d (base)
-  t4@ c_h (current)
-  t3: c_g
+  t4: c_f
+  t3: c_e
   t2: c_d
   t1: c_c
   t0^ c_b (base)
@@ -388,20 +388,20 @@
   $ echo ccc > ddd
   $ hg commit --amend -m 'c_D' 
   $ hg rebase -d . -s 'desc(c_g)'
-  rebasing 10:81264ae8a36a "c_g"
-  rebasing 11:fde5f5941642 "c_h"
+  rebasing 9:81264ae8a36a "c_g"
+  rebasing 10:fde5f5941642 "c_h"
   $ hg log -G
-  o  15 default {foo} draft c_h
+  o  13 default {foo} draft c_h
   |
-  o  14 default {foo} draft c_g
+  o  12 default {foo} draft c_g
   |
-  @  13 default {foo} draft c_D
+  @  11 default {foo} draft c_D
   |
-  | o  9 default {foo} draft c_f
+  | o  8 default {foo} draft c_f
   | |
-  | o  8 default {foo} draft c_e
+  | o  7 default {foo} draft c_e
   | |
-  | x  7 default {foo} draft c_d
+  | x  6 default {foo} draft c_d
   |/
   o  2 default {foo} draft c_c
   |
@@ -413,11 +413,11 @@
   $ hg topic --list
   ### topic: foo (2 heads)
   ### branch: default
-  t6$ c_f (unstable)
-  t5$ c_e (unstable)
+  t6: c_h
+  t5: c_g
   t2^ c_D (base)
-  t4: c_h
-  t3: c_g
+  t4$ c_f (unstable)
+  t3$ c_e (unstable)
   t2@ c_D (current)
   t1: c_c
   t0^ c_b (base)
@@ -434,17 +434,17 @@
 ==============================================================================
 
   $ hg log --graph
-  o  15 default {foo} draft c_h
+  o  13 default {foo} draft c_h
   |
-  o  14 default {foo} draft c_g
+  o  12 default {foo} draft c_g
   |
-  @  13 default {foo} draft c_D
+  @  11 default {foo} draft c_D
   |
-  | o  9 default {foo} draft c_f
+  | o  8 default {foo} draft c_f
   | |
-  | o  8 default {foo} draft c_e
+  | o  7 default {foo} draft c_e
   | |
-  | x  7 default {foo} draft c_d
+  | x  6 default {foo} draft c_d
   |/
   o  2 default {foo} draft c_c
   |
@@ -454,19 +454,19 @@
   
 Converting into a linear chain
   $ hg rebase -s 'desc("c_e") - obsolete()' -d 'desc("c_h") - obsolete()'
-  rebasing 8:215bc359096a "c_e"
-  rebasing 9:ec9267b3f33f "c_f"
+  rebasing 7:215bc359096a "c_e"
+  rebasing 8:ec9267b3f33f "c_f"
 
   $ hg log -G
-  o  17 default {foo} draft c_f
+  o  15 default {foo} draft c_f
   |
-  o  16 default {foo} draft c_e
+  o  14 default {foo} draft c_e
   |
-  o  15 default {foo} draft c_h
+  o  13 default {foo} draft c_h
   |
-  o  14 default {foo} draft c_g
+  o  12 default {foo} draft c_g
   |
-  @  13 default {foo} draft c_D
+  @  11 default {foo} draft c_D
   |
   o  2 default {foo} draft c_c
   |
@@ -479,19 +479,19 @@
   switching to topic foobar
   changed topic on 2 changes
   $ hg log -G
-  @  19 default {foobar} draft c_D
+  @  17 default {foobar} draft c_D
   |
-  | o  18 default {foobar} draft c_e
+  | o  16 default {foobar} draft c_e
   | |
-  | | o  17 default {foo} draft c_f
+  | | o  15 default {foo} draft c_f
   | | |
-  | | x  16 default {foo} draft c_e
+  | | x  14 default {foo} draft c_e
   | |/
-  | o  15 default {foo} draft c_h
+  | o  13 default {foo} draft c_h
   | |
-  | o  14 default {foo} draft c_g
+  | o  12 default {foo} draft c_g
   | |
-  | x  13 default {foo} draft c_D
+  | x  11 default {foo} draft c_D
   |/
   o  2 default {foo} draft c_c
   |
@@ -500,30 +500,30 @@
   o  0 default {} public c_a
   
   $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()'
-  rebasing 17:77082e55de88 "c_f"
+  rebasing 15:77082e55de88 "c_f"
   switching to topic foo
   switching to topic foobar
   $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()'
-  rebasing 14:0c3e8aed985d "c_g"
+  rebasing 12:0c3e8aed985d "c_g"
   switching to topic foo
-  rebasing 15:b9e4f3709bc5 "c_h"
-  rebasing 18:4bc813530301 "c_e"
+  rebasing 13:b9e4f3709bc5 "c_h"
+  rebasing 16:4bc813530301 "c_e"
   switching to topic foobar
-  rebasing 20:4406ea4be852 "c_f" (tip)
+  rebasing 18:4406ea4be852 "c_f" (tip)
   switching to topic foo
   switching to topic foobar
   $ hg up
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log --graph
-  o  24 default {foo} draft c_f
+  o  22 default {foo} draft c_f
   |
-  @  23 default {foobar} draft c_e
+  @  21 default {foobar} draft c_e
   |
-  o  22 default {foo} draft c_h
+  o  20 default {foo} draft c_h
   |
-  o  21 default {foo} draft c_g
+  o  19 default {foo} draft c_g
   |
-  o  19 default {foobar} draft c_D
+  o  17 default {foobar} draft c_D
   |
   o  2 default {foo} draft c_c
   |
evolve