--- a/tests/test-evolve-phase-divergence.t Tue Mar 26 11:23:09 2019 +0100
+++ b/tests/test-evolve-phase-divergence.t Tue Mar 12 09:48:05 2019 -0700
@@ -28,7 +28,9 @@
Setting up a private non-publishing repo
----------------------------------------
- $ hg clone -U public private
+ $ hg clone public private
+ updating to branch default
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd private
$ cat >> .hg/hgrc <<EOF
> [extensions]
@@ -52,8 +54,6 @@
Alice creating a draft changeset and pushing to main private repo
$ cd alice
- $ hg update
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo a >> a
$ hg commit -u alice -m 'modify a'
$ hg push ../private
@@ -86,7 +86,7 @@
$ hg glog
o 1:4d1169d82e47 modify a
| () draft
- o 0:d3873e73d99e init
+ @ 0:d3873e73d99e init
() public
$ hg push ../public
@@ -100,7 +100,7 @@
$ hg glog
o 1:4d1169d82e47 modify a
| () public
- o 0:d3873e73d99e init
+ @ 0:d3873e73d99e init
() public
*But* Alice decided to amend the changeset she had and then pulling from public