--- a/tests/test-topic-push-concurrent-on.t Fri Oct 20 16:07:40 2017 +0200
+++ b/tests/test-topic-push-concurrent-on.t Fri Oct 20 19:32:18 2017 +0200
@@ -93,7 +93,7 @@
$ hg outgoing -G
comparing with $TESTTMP/main (glob)
searching for changes
- @ 3 mountain draft CC
+ @ 4 mountain draft CC
$ hg push
pushing to $TESTTMP/main (glob)
@@ -108,7 +108,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 1 new obsolescence markers
+ 2 new obsolescence markers
Including on non-publishing
@@ -119,7 +119,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
- 1 new obsolescence markers
+ 2 new obsolescence markers
Testing topic behavior
======================
@@ -136,9 +136,9 @@
$ hg commit -m 'CD'
active topic 'babar' grew its first changeset
$ hg log -G # keep track of phase because I saw some strange bug during developement
- @ 4 default babar draft CD
+ @ 5 default babar draft CD
|
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -155,9 +155,9 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
$ hg log -G
- @ 4 default babar draft CD
+ @ 5 default babar draft CD
|
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -173,9 +173,9 @@
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ hg log -G
- @ 4 default babar draft CD
+ @ 5 default babar draft CD
|
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -194,11 +194,11 @@
$ hg commit -m 'CE'
active topic 'celeste' grew its first changeset
$ hg log -G # keep track of phase because I saw some strange bug during developement
- @ 5 default celeste draft CE
+ @ 6 default celeste draft CE
|
- | o 4 default babar draft CD
+ | o 5 default babar draft CD
|/
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -218,11 +218,11 @@
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ hg log -G
- @ 5 default celeste draft CE
+ @ 6 default celeste draft CE
|
- | o 4 default babar draft CD
+ | o 5 default babar draft CD
|/
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -241,11 +241,11 @@
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files (+1 heads)
$ hg log -G
- @ 5 default celeste draft CE
+ @ 6 default celeste draft CE
|
- | o 4 default babar draft CD
+ | o 5 default babar draft CD
|/
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -261,11 +261,11 @@
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ hg log -G
- @ 5 default celeste draft CE
+ @ 6 default celeste draft CE
|
- | o 4 default babar draft CD
+ | o 5 default babar draft CD
|/
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -283,13 +283,13 @@
$ hg add fff
$ hg commit -m 'CF'
$ hg log -G
- @ 6 default babar draft CF
+ @ 7 default babar draft CF
|
- | o 5 default celeste draft CE
+ | o 6 default celeste draft CE
| |
- | | o 4 default babar draft CD
+ | | o 5 default babar draft CD
| |/
- | | o 3 mountain public CC
+ | | o 4 mountain public CC
| |/
o | 1 default public CB
|/
@@ -321,17 +321,17 @@
(branch merge, don't forget to commit)
$ hg commit -m 'CM'
$ hg log -G
- @ 8 default babar draft CM
+ @ 9 default babar draft CM
|\
- | o 7 default draft CG
+ | o 8 default draft CG
| |
- o | 6 default babar draft CF
+ o | 7 default babar draft CF
| |
- | | o 5 default celeste draft CE
+ | | o 6 default celeste draft CE
| |/
- | | o 4 default babar draft CD
+ | | o 5 default babar draft CD
| |/
- | | o 3 mountain public CC
+ | | o 4 mountain public CC
| |/
o | 1 default public CB
|/