evolve: comparison tests/test-evolve.t

equal deleted inserted replaced

-:3810ca63398f
+:79bc0f1a832e
 (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
 1	: a nifty feature - test
 0	: base - test
 $ hg up -q 0
 $ 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)
 | |/
 | x  1:568a468b60fc@default(draft) a nifty feature
 |/
 0	: base - test
 phase change turning obsolete changeset public issues a phase divergence warning
 $ hg phase --hidden --public 99833d22b0c6
-1 new phase-divergent changesets
 all solving phase-divergent
 $ glog
 @  6:47d52a103155@default(draft) another feature that rox
 $ hg commit -m 'dansk 3!'
 $ hg update aca219761afb
 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} {instabilities}\n'
 @  10
 |
-| *  9 orphan
+| o  9 orphan
 | |
-| *  8 orphan
+| o  8 orphan
 | |
 | x  7
 |/
 o  5
 |
 adding b
 $ hg mv a c
 $ hg ci -m c
 $ hg prune .^
 1 changesets pruned
-1 new orphan changesets
 $ hg stab --any
 move:[15] c
 atop:[13] a
 working directory is now at 3742bde73477
 $ hg st -C --change=tip
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg branch mybranch
 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
 atop:[4] a2
 branch change preserved
 $ 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 --rev 'first(orphan())'
 move:[4] a2
 atop:[6] a1_
 $ hg evolve
 move:[5] a3
 Evolve from the middle of a stack pick the right changesets.
 $ 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
 | |
 | x  6 [default] a1_
 |/
 $ glog
 o  10:d952e93add6f@mybranch(draft) a2
 |
 @  9:9f8b83c2e7f3@default(draft) a1__
 |
-| *  8:777c26ca5e78@mybranch(draft) a3
+| o  8:777c26ca5e78@mybranch(draft) a3
 | |
 | x  7:eb07e22a0e63@mybranch(draft) a2
 | |
 | x  6:faafc6cea0ba@default(draft) a1_
 |/
 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
 o  10 [mybranch] a2
 |
 @  9 [default] a1__
 |
-| *  8 [mybranch] a3
+| o  8 [mybranch] a3
 | |
 | x  7 [mybranch] a2
 | |
 | x  6 [default] a1_
 |/
 $ echo "hello world" > newfile
 $ 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
 |
 | o  10	: a2 - test
 |/
 o  9	testbookmark: a1__ - test
 |
-| *  8	: a3 - test
+| o  8	: a3 - test
 | |
 | x  7	: a2 - test
 | |
 | x  6	: a1_ - test
 |/
 |
 | o  10	: a2 - test
 |/
 o  9	testbookmark: a1__ - test
 |
-| *  8	: a3 - test
+| o  8	: a3 - test
 | |
 | x  7	: a2 - test
 | |
 | x  6	: a1_ - test
 |/
 o  9	testbookmark: a1__ - test
 |
 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
 |/
 o  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
 |
 [255]
 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
 $ hg --hidden up 14
-updating to a hidden changeset 484fb3cfa7f2
+2 files updated, 0 files merged, 1 files removed, 0 files unresolved
-(hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272)
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (484fb3cfa7f2)
 $ cat >> $HGRCPATH <<EOF
 > [experimental]
 > 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)
 Restore all of the evolution features
 $ hg up .^^
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 $ 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
 |/
 | o  18:0c049e4e5422@default(draft) add gh
 | |
 new changeset is empty
 (use 'hg prune .' to remove it)
 $ 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
 |/
 | o  18:0c049e4e5422@default(draft) add gh
 | |
 ~
 $ hg update -q -r "desc('will be amended')"
 $ echo "amended" > newfile
 $ hg amend -m "amended"
-2 new orphan changesets
 $ hg evolve --rev "desc('will be amended')::"
 move:[30] will be evolved safely
 atop:[32] amended
 move:[31] will cause conflict at evolve
 $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n"
 @  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)
 $ hg bookmark book

branch	mercurial-4.4
changeset 4675	79bc0f1a832e
parent 4673	3ef4980353af
parent 4516	f54bb6eaf5e6