--- a/tests/test-topic-stack-complex.t Wed Mar 21 16:32:54 2018 +0100
+++ b/tests/test-topic-stack-complex.t Wed Mar 21 16:35:18 2018 +0100
@@ -12,7 +12,6 @@
> [defaults]
> split = -d "0 "0
> [extensions]
- > show =
> EOF
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
@@ -33,11 +32,31 @@
$ echo e > e
$ echo f > f
$ hg ci -Aqm "Added e and f"
- $ hg show work
- @ f1d36 Added e and f
- o 8e825 Added c and d
- o 002b8 Added a and b
- o f3603 Added foo
+ $ hg log -G
+ @ changeset: 3:f1d3649d6a8b
+ | tag: tip
+ | topic: foo
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: Added e and f
+ |
+ o changeset: 2:8e8251e8193b
+ | topic: foo
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: Added c and d
+ |
+ o changeset: 1:002b85930b9c
+ | topic: foo
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: Added a and b
+ |
+ o changeset: 0:f3603c09ac10
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: Added foo
+
Testing in case of split within the topic
@@ -93,14 +112,45 @@
t1: Added a and b
t0^ Added foo (base)
- $ hg show work
- @ 5ccee split2
- o f26c1 split1
- | o f1d36 Added e and f
- | x 8e825 Added c and d
- |/
- o 002b8 Added a and b
- o f3603 Added foo
+ $ hg log -G
+ @ changeset: 5:5ccee6da565e
+ | tag: tip
+ | topic: foo
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: split2
+ |
+ o changeset: 4:f26c1b9addde
+ | topic: foo
+ | parent: 1:002b85930b9c
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: split1
+ |
+ | o changeset: 3:f1d3649d6a8b
+ | | topic: foo
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | trouble: unstable
+ | | summary: Added e and f
+ | |
+ | x changeset: 2:8e8251e8193b
+ |/ topic: foo
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: Added c and d
+ |
+ o changeset: 1:002b85930b9c
+ | topic: foo
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: Added a and b
+ |
+ o changeset: 0:f3603c09ac10
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: Added foo
+
$ hg prev
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -116,16 +166,54 @@
$ hg amend
1 new unstable changesets
- $ hg show work
- @ 7d944 split1
- | o 5ccee split2
- | x f26c1 split1
- |/
- | o f1d36 Added e and f
- | x 8e825 Added c and d
- |/
- o 002b8 Added a and b
- o f3603 Added foo
+
+ $ hg log -G
+ @ changeset: 7:7d9445714d83
+ | tag: tip
+ | topic: foo
+ | parent: 1:002b85930b9c
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: split1
+ |
+ | o changeset: 5:5ccee6da565e
+ | | topic: foo
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | trouble: unstable
+ | | summary: split2
+ | |
+ | x changeset: 4:f26c1b9addde
+ |/ topic: foo
+ | parent: 1:002b85930b9c
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: split1
+ |
+ | o changeset: 3:f1d3649d6a8b
+ | | topic: foo
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | trouble: unstable
+ | | summary: Added e and f
+ | |
+ | x changeset: 2:8e8251e8193b
+ |/ topic: foo
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: Added c and d
+ |
+ o changeset: 1:002b85930b9c
+ | topic: foo
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: Added a and b
+ |
+ o changeset: 0:f3603c09ac10
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: Added foo
+
$ hg stack
### topic: foo (2 heads)