evolve: comparison tests/test-evolve.t

equal deleted inserted replaced

-:f25c79365f5d
+:00e4d31b8cdb
 |/
 o  6	feature-A: a nifty feature - test
 |
 o  0	: base - test
-$ hg evolve --any --traceback --bumped
+$ hg evolve --any --traceback --phasedivergent
 recreate:[8] another feature that rox
 atop:[7] another feature (child of ba0ec09b1bab)
 computing new diff
 committed as 6707c5e1c49d
 working directory is now at 6707c5e1c49d
 (ninja test for the {trouble} template:
 $ hg log -G --template '{rev} {troubles}\n'
 @  13
 |
-| o  11 unstable
+| o  11 orphan
 | |
-| o  10 unstable
+| o  10 orphan
 | |
 | x  9
 |/
 o  7
 |
 $ hg olog | head -n 10 # hg touch makes the output unstable (fix it with devel option for more stable touch)
 @    d26d339c513f (12) add 4
 |\
 x |    af636757ce3b (11) add 3
-|\ \     rewritten(description, user, parent, content) by test (*) as d26d339c513f (glob)
+|\ \     rewritten(description, user, parent, content) as d26d339c513f by test (*) (glob)
 | | |
 | \ \
 | |\ \
 | | | x  ce341209337f (4) add 4
-| | |      rewritten(description, user, content) by test (*) as d26d339c513f (glob)
+| | |      rewritten(description, user, content) as d26d339c513f by test (*) (glob)
 | | |
 Test obsstore stat
 $ hg debugobsstorestat
 |/
 o  0 [default] a0
 $ hg evolve
 nothing to evolve on current working copy parent
-(2 other unstable in the repository, do you want --any or --rev)
+(2 other orphan in the repository, do you want --any or --rev)
 [2]
 Evolve disables active bookmarks.
 atop:[10] a1__
 (leaving bookmark testbookmark)
 working directory is now at d952e93add6f
 $ ls .hg/bookmarks*
 .hg/bookmarks
+$ hg log -G
+@  11	: a2 - test
+|
+o  10	testbookmark: a1__ - test
+|
+| o  9	: a3 - test
+| |
+| x  8	: a2 - test
+| |
+| x  7	: a1_ - test
+|/
+o  0	: a0 - test
 Possibility to select what trouble to solve first, asking for bumped before
 divergent
 $ hg up 10
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 | |
 | x  7	: a1_ - test
 |/
 o  0	: a0 - test
-$ hg evolve -r 12 --bumped
+$ hg evolve -r 12 --phasedivergent
 recreate:[12] add new file bumped
 atop:[11] a2
 computing new diff
 committed as f15d32934071
 working directory is now at f15d32934071
 $ hg evolve --any
 move:[9] a3
 atop:[13] bumped update to d952e93add6f:
 working directory is now at cce26b684bfe
+$ glog
+@  14:cce26b684bfe@default(draft) a3
+|
+o  13:f15d32934071@default(draft) bumped update to d952e93add6f:
+|
+o  11:d952e93add6f@mybranch(public) a2
+|
+o  10:9f8b83c2e7f3@default(public) a1__
+|
+o  0:07c1c36d9ef0@default(public) a0
 Check that we can resolve troubles in a revset with more than one commit
-$ hg up 14 -C
+$ hg up cce26b684bfe -C
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ mkcommit gg
-$ hg up 14
+$ hg up cce26b684bfe
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 $ mkcommit gh
 created new head
-$ hg up 14
+$ hg up cce26b684bfe
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 $ printf "newline\nnewline\n" >> a
 $ hg log -G
 o  16	: add gh - test
 |
 Evolving an empty revset should do nothing
 $ hg evolve --rev "16 and 15"
 set of specified revisions is empty
 [1]
-$ hg evolve --rev "14::" --bumped
+$ hg evolve --rev "14::" --phasedivergent
-no bumped changesets in specified revisions
+no phasedivergent changesets in specified revisions
-(do you want to use --unstable)
+(do you want to use --orphan)
 [2]
-$ hg evolve --rev "14::" --unstable
+$ hg evolve --rev "14::" --orphan
 move:[15] add gg
 atop:[18] a3
 move:[16] add gh
 atop:[18] a3
 working directory is now at e02107f98737
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg up 20
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 $ hg evolve --all
 nothing to evolve on current working copy parent
-(2 other unstable in the repository, do you want --any or --rev)
+(2 other orphan in the repository, do you want --any or --rev)
 [2]
 $ hg evolve --all --any
 move:[22] add j2
 atop:[26] add j1
 move:[23] add j3
 $ printf "oo" > oo;
 $ printf "pp" > pp;
 $ hg add oo pp
 $ hg commit -m "oo+pp"
 $ mkcommit uu
-$ hg up 30
+$ hg up 68330ac625b8
 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
 $ printf "oo" > oo;
 $ hg add oo
 $ hg commit -m "_oo"
 created new head
 $ echo "will cause conflict at evolve" > newfile
 $ echo "newly added" > newlyadded
 $ hg add newlyadded
 $ hg commit -m "will cause conflict at evolve"
-$ hg update -q 37
+$ glog -r "edc3c9de504e::"
+@  39:02e943732647@default(draft) will cause conflict at evolve
+|
+o  38:f8e30e9317aa@default(draft) will be evolved safely
+|
+o  37:36030b147271@default(draft) will be amended
+|
+o  36:43c3f5ef149f@default(draft) add uu
+|
+o  35:7a555adf2b4a@default(draft) _pp
+|
+o  34:2be4d2d5bf34@default(draft) _oo
+|
+| o  31:580886d07058@default(draft) add gg
+| |
+o |  30:68330ac625b8@default(draft) add unstableifparentisfolded
+|/
+| o  20:e02107f98737@default(draft) add gh
+|/
+o  18:edc3c9de504e@default(draft) a3
+|
+~
+$ hg update -q 36030b147271
 $ echo "amended" > newfile
 $ hg amend -m "amended"
 2 new unstable changesets
 $ hg evolve --rev "37::"

branch	mercurial-4.1
changeset 3002	00e4d31b8cdb
parent 2799	1627153804dc
parent 3001	67b59d1657cf
child 3004	a456f55b3a6b
child 3109	3024ae293732