test: add topic on the first 2 changesets too
This will be used to add a test for topic rooted on nullid. We introduce this in
its own changeset to reduce the noise if the actual changeset.
--- a/tests/test-topic-stack.t Mon Apr 04 00:17:54 2016 -0700
+++ b/tests/test-topic-stack.t Mon Apr 04 00:22:20 2016 -0700
@@ -12,6 +12,7 @@
$ hg init main
$ cd main
+ $ hg topic other
$ echo aaa > aaa
$ hg add aaa
$ hg commit -m c_a
@@ -40,11 +41,13 @@
|
o 2 default {foo} draft c_c
|
- o 1 default {} draft c_b
+ o 1 default {other} draft c_b
|
- o 0 default {} draft c_a
+ o 0 default {other} draft c_a
+ $ hg phase --public 'topic("other")'
+
Simple test
-----------
@@ -80,12 +83,12 @@
$ hg up t2
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg summary
- parent: 3:f9c59b863cdb
+ parent: 3:e629654d7050
c_d
branch: default
commit: (clean)
update: (current)
- phases: 6 draft
+ phases: 4 draft
topic: foo
Case with some of the topic unstable
@@ -104,9 +107,9 @@
|/
o 2 default {foo} draft c_c
|
- o 1 default {} draft c_b
+ o 1 default {} public c_b
|
- o 0 default {} draft c_a
+ o 0 default {} public c_a
$ hg topic --list
t4$ c_f (unstable)
@@ -129,8 +132,8 @@
Make things linear again
$ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()'
- rebasing 4:91fa8808d101 "c_e"
- rebasing 5:4ec5094907b7 "c_f"
+ rebasing 4:0f9ac936c87d "c_e"
+ rebasing 5:6559e6d93aea "c_f"
$ hg log -G
o 9 default {foo} draft c_f
|
@@ -140,9 +143,9 @@
|
o 2 default {foo} draft c_c
|
- o 1 default {} draft c_b
+ o 1 default {} public c_b
|
- o 0 default {} draft c_a
+ o 0 default {} public c_a
@@ -169,9 +172,9 @@
|
o 2 default {foo} draft c_c
|
- o 1 default {} draft c_b
+ o 1 default {} public c_b
|
- o 0 default {} draft c_a
+ o 0 default {} public c_a
Test output
@@ -196,8 +199,8 @@
$ echo ccc > ddd
$ hg commit --amend -m 'c_D'
$ hg rebase -d . -s 'desc(c_g)'
- rebasing 10:11286b4fcb3d "c_g"
- rebasing 11:3ad57527186d "c_h"
+ rebasing 10:81264ae8a36a "c_g"
+ rebasing 11:fde5f5941642 "c_h"
$ hg log -G
o 15 default {foo} draft c_h
|
@@ -213,9 +216,9 @@
|/
o 2 default {foo} draft c_c
|
- o 1 default {} draft c_b
+ o 1 default {} public c_b
|
- o 0 default {} draft c_a
+ o 0 default {} public c_a
$ hg topic --list