--- a/tests/test-stabilize-result.t Tue Jan 22 12:55:09 2019 -0500
+++ b/tests/test-stabilize-result.t Tue Jan 22 12:57:25 2019 -0500
@@ -27,7 +27,6 @@
(leaving bookmark changea)
$ echo a >> a
$ hg amend -m changea
- 1 new orphan changesets
$ hg evolve -v --confirm
move:[2] changea
atop:[3] changea
@@ -75,7 +74,6 @@
[3] changea
$ echo 'a' > a
$ hg amend
- 1 new orphan changesets
$ hg evolve
move:[4] newer a
atop:[5] changea
@@ -138,7 +136,6 @@
Make precursors public
$ hg phase --hidden --public 1cf0aacfd363
- 1 new phase-divergent changesets
$ glog
@ 9:99c21c89bcef@default(draft) bk:[] newer a
|
@@ -236,8 +233,6 @@
$ echo 'babar' >> a
$ hg amend
$ hg up --hidden 3932c176bbaa
- updating to a hidden changeset 3932c176bbaa
- (hidden revision '3932c176bbaa' was rewritten as: d2f173e25686)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (3932c176bbaa)
(use 'hg evolve' to update to its successor: d2f173e25686)
@@ -246,11 +241,10 @@
$ cat a.old >> a
$ rm a.old
$ hg amend
- 2 new content-divergent changesets
$ glog
@ 14:eacc9c8240fe@default(draft) bk:[] More addition
|
- | * 13:d2f173e25686@default(draft) bk:[] More addition
+ | o 13:d2f173e25686@default(draft) bk:[] More addition
|/
| o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
| |
@@ -344,14 +338,11 @@
-------------------------------------------------
$ hg up --hidden 3932c176bbaa
- updating to a hidden changeset 3932c176bbaa
- (hidden revision '3932c176bbaa' was rewritten as: 4d6ed26797bc)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (3932c176bbaa)
(use 'hg evolve' to update to its successor: 4d6ed26797bc)
$ echo 'gotta break' >> a
$ hg amend
- 2 new content-divergent changesets
# reamend so that the case is not the first precursor.
$ hg amend -m "More addition (2)"
$ hg phase 'contentdivergent()'
@@ -361,7 +352,7 @@
$ glog
@ 17:0b336205a5d0@default(draft) bk:[] More addition (2)
|
- | * 15:4d6ed26797bc@default(draft) bk:[] More addition
+ | o 15:4d6ed26797bc@default(draft) bk:[] More addition
|/
| o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
| |