--- a/tests/test-evolve.t Tue Jan 22 12:55:09 2019 -0500
+++ b/tests/test-evolve.t Tue Jan 22 12:57:25 2019 -0500
@@ -344,7 +344,6 @@
(amend of on ancestors)
$ hg amend
- 1 new orphan changesets
$ hg log
4 feature-A: a nifty feature - test
3 feature-B: another feature (child of 568a468b60fc) - test
@@ -354,7 +353,7 @@
$ glog --hidden
o 4:ba0ec09b1bab@default(draft) a nifty feature
|
- | * 3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
+ | o 3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
| |
| | x 2:73296a82292a@default(draft) another feature (child of 568a468b60fc)
| |/
@@ -393,7 +392,6 @@
phase change turning obsolete changeset public issue a bumped warning
$ hg phase --hidden --public 99833d22b0c6
- 1 new phase-divergent changesets
all solving bumped troubled
@@ -440,16 +438,15 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ sed -i'' -e s/Un/Én/ main-file-1
$ hg commit --amend -m 'dansk!'
- 2 new orphan changesets
(ninja test for the {trouble} template:
$ hg log -G --template '{rev} {troubles}\n'
@ 10
|
- | * 9 orphan
+ | o 9 orphan
| |
- | * 8 orphan
+ | o 8 orphan
| |
| x 7
|/
@@ -827,7 +824,6 @@
$ hg ci -m c
$ hg prune .^
1 changesets pruned
- 1 new orphan changesets
$ hg stab --any
move:[15] c
atop:[13] a
@@ -904,7 +900,6 @@
marked working directory as branch mybranch
(branches are permanent and global, did you want a bookmark?)
$ hg amend
- 1 new orphan changesets
$ hg evolve
move:[3] a3
@@ -926,7 +921,6 @@
$ hg up 'desc(a1)'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg amend -m 'a1_'
- 2 new orphan changesets
$ hg evolve
move:[4] a2
atop:[6] a1_
@@ -950,14 +944,13 @@
$ hg up -r "desc('a1_')"
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg ci --amend -m 'a1__'
- 2 new orphan changesets
$ hg up -r "desc('a2')"
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
o 9 [default] a1__
|
- | * 8 [mybranch] a3
+ | o 8 [mybranch] a3
| |
| @ 7 [mybranch] a2
| |
@@ -991,7 +984,7 @@
|
o 9:9f8b83c2e7f3@default(draft) a1__
|
- | * 8:777c26ca5e78@mybranch(draft) a3
+ | o 8:777c26ca5e78@mybranch(draft) a3
| |
| x 7:eb07e22a0e63@mybranch(draft) a2
| |
@@ -1011,7 +1004,7 @@
|
@ 9 [default] a1__
|
- | * 8 [mybranch] a3
+ | o 8 [mybranch] a3
| |
| x 7 [mybranch] a2
| |
@@ -1023,7 +1016,6 @@
$ hg add newfile
$ hg commit -m "add new file bumped" -o 10
$ hg phase --public --hidden d952e93add6f
- 1 new phase-divergent changesets
$ hg log -G
@ 11 : add new file bumped - test
|
@@ -1031,7 +1023,7 @@
|/
o 9 testbookmark: a1__ - test
|
- | * 8 : a3 - test
+ | o 8 : a3 - test
| |
| x 7 : a2 - test
| |
@@ -1050,7 +1042,7 @@
|/
o 9 testbookmark: a1__ - test
|
- | * 8 : a3 - test
+ | o 8 : a3 - test
| |
| x 7 : a2 - test
| |
@@ -1107,13 +1099,12 @@
o 0 : a0 - test
$ hg amend
- 2 new orphan changesets
$ glog
@ 16:0cf3707e8971@default(draft) a3
|
- | * 15:daa1ff1c7fbd@default(draft) add gh
+ | o 15:daa1ff1c7fbd@default(draft) add gh
| |
- | | * 14:484fb3cfa7f2@default(draft) add gg
+ | | o 14:484fb3cfa7f2@default(draft) add gg
| |/
| x 13:b88539ad24d7@default(draft) a3
|/
@@ -1253,8 +1244,6 @@
Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
$ hg --hidden up 14
- updating to a hidden changeset 484fb3cfa7f2
- (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272)
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory parent is obsolete! (484fb3cfa7f2)
$ cat >> $HGRCPATH <<EOF
@@ -1262,8 +1251,6 @@
> evolutioncommands=evolve
> EOF
$ hg --hidden up 15
- updating to a hidden changeset daa1ff1c7fbd
- (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory parent is obsolete! (daa1ff1c7fbd)
(use 'hg evolve' to update to its successor: 0c049e4e5422)
@@ -1286,13 +1273,12 @@
$ echo "hello" > j4
$ hg add j4
$ hg amend
- 2 new orphan changesets
$ glog -r "0cf3707e8971::"
@ 22:274b6cd0c101@default(draft) add j1
|
- | * 21:89e4f7e8feb5@default(draft) add j3
+ | o 21:89e4f7e8feb5@default(draft) add j3
| |
- | * 20:4cd61236beca@default(draft) add j2
+ | o 20:4cd61236beca@default(draft) add j2
| |
| x 19:0fd8bfb02de4@default(draft) add j1
|/
@@ -1330,9 +1316,9 @@
$ glog -r "0cf3707e8971::"
@ 23:0ef9ff75f8e2@default(draft) add j1
|
- | * 21:89e4f7e8feb5@default(draft) add j3
+ | o 21:89e4f7e8feb5@default(draft) add j3
| |
- | * 20:4cd61236beca@default(draft) add j2
+ | o 20:4cd61236beca@default(draft) add j2
| |
| x 19:0fd8bfb02de4@default(draft) add j1
|/
@@ -1457,13 +1443,12 @@
$ hg commit -m "_pp"
$ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split
1 changesets pruned
- 1 new orphan changesets
$ glog -r "0cf3707e8971::"
@ 32:c7dbf668e9d5@default(draft) _pp
|
o 31:2b5a32114b3d@default(draft) _oo
|
- | * 30:4d122571f3b6@default(draft) add uu
+ | o 30:4d122571f3b6@default(draft) add uu
| |
| x 29:7da3e73df8a5@default(draft) oo+pp
|/
@@ -1524,7 +1509,6 @@
$ hg update -q 98c7ab460e6b
$ echo "amended" > newfile
$ hg amend -m "amended"
- 2 new orphan changesets
$ hg evolve --rev "98c7ab460e6b::"
move:[35] will be evolved safely
@@ -1572,8 +1556,6 @@
@ 1:ab832e43dd5a added a
$ hg up f7ad41964313 --hidden
- updating to a hidden changeset f7ad41964313
- (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (f7ad41964313)
(use 'hg evolve' to update to its successor: ab832e43dd5a)
@@ -1630,7 +1612,6 @@
$ hg up 2 -q
$ echo "fixit" > c
$ hg ci --amend -m "updated c"
- 1 new orphan changesets
$ hg up 3 -q
$ echo "fixit" > c
$ hg ci --amend -m "updated f"
@@ -1639,7 +1620,7 @@
|
| o 5:f84f2c548fbc@default(draft) updated c
|/
- | * 4:2c0a98d38026@default(draft) merge feature branch
+ | o 4:2c0a98d38026@default(draft) merge feature branch
| |\
+---x 3:4c33e511041e@default(draft) added feature f
| |
@@ -1665,11 +1646,10 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "updated d" >> d
$ hg ci --amend -m "updated d"
- 1 new orphan changesets
$ glog
@ 9:7c4d1834c346@default(draft) updated d
|
- | * 8:421f7614462a@default(draft) added e
+ | o 8:421f7614462a@default(draft) added e
| |
| x 7:afe5acea1990@default(draft) added d
|/
@@ -1677,7 +1657,7 @@
|/
| o 5:f84f2c548fbc@default(draft) updated c
|/
- | * 4:2c0a98d38026@default(draft) merge feature branch
+ | o 4:2c0a98d38026@default(draft) merge feature branch
| |\
+---x 3:4c33e511041e@default(draft) added feature f
| |