evolve: comparison tests/test-evolve.t

equal deleted inserted replaced

-:19ec729f3ca2
+:a77fb9669e99
 This results in a new single changeset for our amended changeset, and the old
 changeset plus the updating changeset are hidden from view by default::
 $ hg log
-3	feature-B: another feature (child of 568a468b60fc) - test
+4	feature-B: another feature (child of 568a468b60fc) - test
 1	feature-A: a nifty feature - test
 0	: base - test
 $ hg up feature-A -q
 $ hg bookmark -i feature-A
 (amend of on ancestors)
 $ hg amend
-1 new orphan changesets
+1 new unstable changesets
 $ hg log
-4	feature-A: a nifty feature - test
+6	feature-A: a nifty feature - test
-3	feature-B: another feature (child of 568a468b60fc) - test
+4	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
+o  6:ba0ec09b1bab@default(draft) a nifty feature
 |
-| o  3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
+| x  5:c296b79833d1@default(draft) temporary amend commit for 568a468b60fc
 | |
+| | o  4:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
+| |/
+| | x  3:c97947cdc7a2@default(draft) temporary amend commit for 73296a82292a
+| | |
 | | x  2:73296a82292a@default(draft) another feature (child of 568a468b60fc)
 | |/
 | x  1:568a468b60fc@default(draft) a nifty feature
 |/
 @  0:e55e0562ee93@default(public) base
 $ hg debugobsolete
-73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'ef1': '8', 'user': 'test'} (glob)
-568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+c97947cdc7a2a11cf78419f5c2c3dd3944ec79e8 0 {73296a82292a76fb8a7061969d2489ec0d84cd5e} (*) {'ef1': '0', 'user': 'test'} (glob)
+568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'ef1': '8', 'user': 'test'} (glob)
+c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'ef1': '0', 'user': 'test'} (glob)
 $ hg evolve
-move:[3] another feature (child of 568a468b60fc)
+move:[4] another feature (child of 568a468b60fc)
-atop:[4] a nifty feature
+atop:[6] a nifty feature
 merging main-file-1
 working directory is now at 99833d22b0c6
 $ hg log
-5	feature-B: another feature (child of ba0ec09b1bab) - test
+7	feature-B: another feature (child of ba0ec09b1bab) - test
-4	feature-A: a nifty feature - test
+6	feature-A: a nifty feature - test
 0	: base - test
 Test commit -o options
 $ hg up -r "desc('a nifty feature')"
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 $ hg revert -r "desc('another feature')" --all
 adding file-from-B
 reverting main-file-1
 $ sed -i'' -e s/Zwei/deux/ main-file-1
-$ hg commit -m 'another feature that rox' -o 5
+$ hg commit -m 'another feature that rox' -o 7
 created new head
 $ hg log
-6	feature-B: another feature that rox - test
+8	feature-B: another feature that rox - test
-4	feature-A: a nifty feature - test
+6	feature-A: a nifty feature - test
 0	: base - test
 phase change turning obsolete changeset public issue a bumped warning
 $ hg phase --hidden --public 99833d22b0c6
-1 new phase-divergent changesets
+1 new bumped changesets
 all solving bumped troubled
-$ glog
+$ hg log -G
-@  6:47d52a103155@default(draft) another feature that rox
+@  8	feature-B: another feature that rox - test
 |
-| o  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+| o  7	: another feature (child of ba0ec09b1bab) - test
 |/
-o  4:ba0ec09b1bab@default(public) a nifty feature
+o  6	feature-A: a nifty feature - test
 |
-o  0:e55e0562ee93@default(public) base
+o  0	: base - test
 $ hg evolve --any --traceback --phase-divergent
-recreate:[6] another feature that rox
+recreate:[8] another feature that rox
-atop:[5] another feature (child of ba0ec09b1bab)
+atop:[7] another feature (child of ba0ec09b1bab)
 computing new diff
-committed as aca219761afb
+committed as 6707c5e1c49d
-working directory is now at aca219761afb
+working directory is now at 6707c5e1c49d
-$ glog
+$ hg log -G
-@  7:aca219761afb@default(draft) phase-divergent update to 99833d22b0c6:
+@  9	feature-B: bumped update to 99833d22b0c6: - test
 |
-o  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+o  7	: another feature (child of ba0ec09b1bab) - test
 |
-o  4:ba0ec09b1bab@default(public) a nifty feature
+o  6	feature-A: a nifty feature - test
 |
-o  0:e55e0562ee93@default(public) base
+o  0	: base - test
-$ hg diff --hidden -r aca219761afb -r 47d52a103155
+$ hg diff --hidden -r 6707c5e1c49d -r 47d52a103155
-$ hg diff -r aca219761afb^ -r aca219761afb
+$ hg diff -r 6707c5e1c49d^ -r 6707c5e1c49d
 diff --git a/main-file-1 b/main-file-1
 --- a/main-file-1
 +++ b/main-file-1
 @@ -3,1 +3,1 @@
 -Zwei
 test evolve --all
 $ sed -i'' -e s/deux/to/ main-file-1
 $ hg commit -m 'dansk 2!'
 $ sed -i'' -e s/Three/tre/ main-file-1
 $ hg commit -m 'dansk 3!'
-$ hg update aca219761afb
+$ hg update 6707c5e1c49d
 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
+2 new unstable changesets
 (ninja test for the {trouble} template:
 $ hg log -G --template '{rev} {troubles}\n'
-@  10
+@  13
 |
-| o  9 orphan
+| o  11 orphan
 | |
-| o  8 orphan
+| o  10 orphan
 | |
-| x  7
+| x  9
 |/
-o  5
+o  7
 |
-o  4
+o  6
 |
 o  0
 (/ninja)
 $ hg evolve --all --traceback
-move:[8] dansk 2!
+move:[10] dansk 2!
-atop:[10] dansk!
+atop:[13] dansk!
 merging main-file-1
-move:[9] dansk 3!
+move:[11] dansk 3!
-atop:[11] dansk 2!
+atop:[14] dansk 2!
 merging main-file-1
-working directory is now at 96abb1319a47
+working directory is now at 68557e4f0048
 $ hg log -G
-@  12	: dansk 3! - test
+@  15	: dansk 3! - test
 |
-o  11	: dansk 2! - test
+o  14	: dansk 2! - test
 |
-o  10	feature-B: dansk! - test
+o  13	feature-B: dansk! - test
 |
-o  5	: another feature (child of ba0ec09b1bab) - test
+o  7	: another feature (child of ba0ec09b1bab) - test
 |
-o  4	feature-A: a nifty feature - test
+o  6	feature-A: a nifty feature - test
 |
 o  0	: base - test
 $ cd ..
 $ hg clone -Ur 0 alpha beta
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
-new changesets 702e4d0a6d86
 $ cd alpha
 $ cat << EOF > A
 > We
 > need
 $ hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
-3 files, 3 changesets, 3 total revisions
+3 files, 4 changesets, 4 total revisions
 $ hg --config extensions.hgext.mq= strip 'extinct()'
 abort: empty revision set
 [255]
 (do some garbare collection)
 $ hg --config extensions.hgext.mq= strip --hidden 'extinct()'  --config devel.strip-obsmarkers=no
-saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-a365b072-backup.hg (glob)
+saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-d7bd82e9-backup.hg (glob)
 $ hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
-1 new obsolescence markers
+2 new obsolescence markers
-new changesets c6dda801837c
 (run 'hg update' to get a working copy)
 $ hg up
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ cd ..
 | o  1:73d38bb17fd7@default(draft) add 1
 |/
 o  0:8685c6d34325@default(draft) add 0
 $ hg debugobsolete
-0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'grab', 'user': 'test'}
+0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
+db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 Test grab --continue
 $ hg up -qC 0
 $ echo 2 > 1
 | o  1:73d38bb17fd7@default(draft) add 1
 |/
 o  0:8685c6d34325@default(draft) add 0
 $ hg debugobsolete
-0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'grab', 'user': 'test'}
+0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
+db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 fb2c0f0a0c54be4367988521bad2cbd33a540969 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'grab', 'user': 'test'}
+a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 Test touch
 $ glog
 @  8:fb2c0f0a0c54@default(draft) conflict
 Test olog
 $ 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 |  ce341209337f (4) add 4
+x |    af636757ce3b (11) add 3
-/     rewritten(description, user, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+|\ \     rewritten as d26d339c513f by test (Thu Jan 01 00:00:00 1970 +0000)
-|
+| | |
-x    cf0c3904643c (11) add 3
+| \ \
-|\     rewritten(description, user, parent, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+| |\ \
-| |
+| | | x  ce341209337f (4) add 4
-| \
+| | |      rewritten as d26d339c513f by test (Thu Jan 01 00:00:00 1970 +0000)
-| |\
+| | |
 Test obsstore stat
 $ hg debugobsstorestat
 markers total:                     10
 markers with no successors:         0
 1 successors:        10
 2 successors:         0
 more than 2 successors:         0
 available  keys:
-ef1:               10
-operation:               10
 user:               10
 marker size:
 format v1:
-smallest length:           90
-longer length:             92
-median length:             91
-mean length:               90
-format v0:
 smallest length:           * (glob)
 longer length:             * (glob)
 median length:             * (glob)
 mean length:               * (glob)
+format v0:
+smallest length:           66
+longer length:             66
+median length:             66
+mean length:               66
 disconnected clusters:              1
 any known node:             1
 smallest length:           10
 longer length:             10
 median length:             10
 adding b
 $ hg mv a c
 $ hg ci -m c
 $ hg prune .^
 1 changesets pruned
-1 new orphan changesets
+1 new unstable changesets
 $ hg stab --any
 move:[15] c
 atop:[13] a
 working directory is now at 3742bde73477
 $ hg st -C --change=tip
 $ cd ../work
 $ hg fold --from .^ --message "Folding with custom commit message"
 2 changesets folded
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ glog
-@  13:284c0d45770d@default(draft) Folding with custom commit message
+@  16:98cb758db56d@default(draft) Folding with custom commit message
 |
-o  10:9975c016fe7b@default(draft) dansk!
+o  13:0a2f9b959bb4@default(draft) dansk!
 |
-o  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+o  7:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
 |
-o  4:ba0ec09b1bab@default(public) a nifty feature
+o  6:ba0ec09b1bab@default(public) a nifty feature
 |
 o  0:e55e0562ee93@default(public) base
 $ cat > commit-message <<EOF
 > A longer
 $ hg fold --from .^ --logfile commit-message
 2 changesets folded
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg qlog
-14 - 8693d0f277b8 A longer
+17 - a00182c58888 A longer
 commit message (draft)
-5 - 99833d22b0c6 another feature (child of ba0ec09b1bab) (public)
+7 - 99833d22b0c6 another feature (child of ba0ec09b1bab) (public)
-4 - ba0ec09b1bab a nifty feature (public)
+6 - ba0ec09b1bab a nifty feature (public)
 0 - e55e0562ee93 base (public)
 $ cd ..
 Test branch preservation:
 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
+1 new unstable changesets
 $ hg evolve
 move:[3] a3
-atop:[4] a2
+atop:[5] a2
 working directory is now at 7c5649f73d11
 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
-@  5 [mybranch] a3
+@  6 [mybranch] a3
 |
-o  4 [mybranch] a2
+o  5 [mybranch] a2
 |
 o  1 [default] a1
 |
 o  0 [default] a0
 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
+2 new unstable changesets
 $ hg evolve
-move:[4] a2
+move:[5] a2
-atop:[6] a1_
+atop:[7] a1_
 working directory is now at eb07e22a0e63
 $ hg evolve
-move:[5] a3
+move:[6] a3
-atop:[7] a2
+atop:[8] a2
 working directory is now at 777c26ca5e78
 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
-@  8 [mybranch] a3
+@  9 [mybranch] a3
 |
-o  7 [mybranch] a2
+o  8 [mybranch] a2
 |
-o  6 [default] a1_
+o  7 [default] a1_
 |
 o  0 [default] a0
 Evolve from the middle of a stack pick the right changesets.
 $ 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
+2 new unstable 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__
+o  10 [default] a1__
 |
-| o  8 [mybranch] a3
+| o  9 [mybranch] a3
 | |
-| @  7 [mybranch] a2
+| @  8 [mybranch] a2
 | |
-| x  6 [default] a1_
+| x  7 [default] a1_
 |/
 o  0 [default] a0
 $ hg evolve
 nothing to evolve on current working copy parent
 $ hg bookmark testbookmark
 $ ls .hg/bookmarks*
 .hg/bookmarks
 .hg/bookmarks.* (glob)
 $ hg evolve
-move:[7] a2
+move:[8] a2
-atop:[9] a1__
+atop:[10] a1__
 (leaving bookmark testbookmark)
 working directory is now at d952e93add6f
 $ ls .hg/bookmarks*
 .hg/bookmarks
 $ glog
-@  10:d952e93add6f@mybranch(draft) a2
+@  11:d952e93add6f@mybranch(draft) a2
 |
-o  9:9f8b83c2e7f3@default(draft) a1__
+o  10:9f8b83c2e7f3@default(draft) a1__
 |
-| o  8:777c26ca5e78@mybranch(draft) a3
+| o  9:777c26ca5e78@mybranch(draft) a3
 | |
-| x  7:eb07e22a0e63@mybranch(draft) a2
+| x  8:eb07e22a0e63@mybranch(draft) a2
 | |
-| x  6:faafc6cea0ba@default(draft) a1_
+| x  7:faafc6cea0ba@default(draft) a1_
 |/
 o  0:07c1c36d9ef0@default(draft) a0
 Possibility to select what trouble to solve first, asking for bumped before
 $ hg up -r "desc('a1__')"
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg revert -r d952e93add6f --all
 reverting a
 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
-o  10 [mybranch] a2
+o  11 [mybranch] a2
 |
-@  9 [default] a1__
+@  10 [default] a1__
 |
-| o  8 [mybranch] a3
+| o  9 [mybranch] a3
 | |
-| x  7 [mybranch] a2
+| x  8 [mybranch] a2
 | |
-| x  6 [default] a1_
+| x  7 [default] a1_
 |/
 o  0 [default] a0
 $ echo "hello world" > newfile
 $ hg add newfile
-$ hg commit -m "add new file bumped" -o 10
+$ hg commit -m "add new file bumped" -o 11
 $ hg phase --public --hidden d952e93add6f
-1 new phase-divergent changesets
+1 new bumped changesets
 $ hg log -G
-@  11	: add new file bumped - test
+@  12	: add new file bumped - test
 |
-| o  10	: a2 - test
+| o  11	: a2 - test
 |/
-o  9	testbookmark: a1__ - test
+o  10	testbookmark: a1__ - test
 |
-| o  8	: a3 - test
+| o  9	: a3 - test
 | |
-| x  7	: a2 - test
+| x  8	: a2 - test
 | |
-| x  6	: a1_ - test
+| x  7	: a1_ - test
 |/
 o  0	: a0 - test
 Now we have a bumped and an unstable changeset, we solve the bumped first
 normally the unstable changeset would be solve first
 $ hg log -G
-@  11	: add new file bumped - test
+@  12	: add new file bumped - test
 |
-| o  10	: a2 - test
+| o  11	: a2 - test
 |/
-o  9	testbookmark: a1__ - test
+o  10	testbookmark: a1__ - test
 |
-| o  8	: a3 - test
+| o  9	: a3 - test
 | |
-| x  7	: a2 - test
+| x  8	: a2 - test
 | |
-| x  6	: a1_ - test
+| x  7	: a1_ - test
 |/
 o  0	: a0 - test
 $ hg evolve -r "desc('add new file bumped')" --phase-divergent
-recreate:[11] add new file bumped
+recreate:[12] add new file bumped
-atop:[10] a2
+atop:[11] a2
 computing new diff
-committed as a8bb31d4b7f2
+committed as f15d32934071
-working directory is now at a8bb31d4b7f2
+working directory is now at f15d32934071
 $ hg evolve --any
-move:[8] a3
+move:[9] a3
-atop:[12] phase-divergent update to d952e93add6f:
+atop:[13] bumped update to d952e93add6f:
-working directory is now at b88539ad24d7
+working directory is now at cce26b684bfe
-$ glog
-@  13:b88539ad24d7@default(draft) a3
-|
-o  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
-|
-o  10:d952e93add6f@mybranch(public) a2
-|
-o  9: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 b88539ad24d7 -C
+$ hg up cce26b684bfe -C
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ mkcommit gg
-$ hg up b88539ad24d7
+$ hg up cce26b684bfe
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 $ mkcommit gh
 created new head
-$ hg up b88539ad24d7
+$ hg up cce26b684bfe
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 $ printf "newline\nnewline\n" >> a
 $ hg log -G
-o  15	: add gh - test
+o  16	: add gh - test
 |
-| o  14	: add gg - test
+| o  15	: add gg - test
 |/
-@  13	: a3 - test
+@  14	: a3 - test
 |
-o  12	: phase-divergent update to d952e93add6f: - test
+o  13	: bumped update to d952e93add6f: - test
 |
-o  10	: a2 - test
+o  11	: a2 - test
 |
-o  9	testbookmark: a1__ - test
+o  10	testbookmark: a1__ - test
 |
 o  0	: a0 - test
 $ hg amend
-2 new orphan changesets
+2 new unstable changesets
-$ glog
+$ hg log -G
-@  16:0cf3707e8971@default(draft) a3
+@  18	: a3 - test
 |
-| o  15:daa1ff1c7fbd@default(draft) add gh
+| o  16	: add gh - test
 | |
-| | o  14:484fb3cfa7f2@default(draft) add gg
+| | o  15	: add gg - test
 | |/
-| x  13:b88539ad24d7@default(draft) a3
+| x  14	: a3 - test
 |/
-o  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
+o  13	: bumped update to d952e93add6f: - test
 |
-o  10:d952e93add6f@mybranch(public) a2
+o  11	: a2 - test
 |
-o  9:9f8b83c2e7f3@default(public) a1__
+o  10	testbookmark: a1__ - test
 |
-o  0:07c1c36d9ef0@default(public) a0
+o  0	: a0 - test
 Evolving an empty revset should do nothing
-$ hg evolve --rev "daa1ff1c7fbd and 484fb3cfa7f2"
+$ hg evolve --rev "beb41503aa3e and 27247fcb2df6"
 set of specified revisions is empty
 [1]
-$ hg evolve --rev "b88539ad24d7::" --phase-divergent
+$ hg evolve --rev "cce26b684bfe::" --phase-divergent
 no phasedivergent changesets in specified revisions
 (do you want to use --orphan)
 [2]
-$ hg evolve --rev "b88539ad24d7::" --orphan
+$ hg evolve --rev "cce26b684bfe::" --orphan
-move:[14] add gg
+move:[15] add gg
-atop:[16] a3
+atop:[18] a3
-move:[15] add gh
+move:[16] add gh
-atop:[16] a3
+atop:[18] a3
-working directory is now at 0c049e4e5422
+working directory is now at e02107f98737
-$ glog
+$ hg log -G
-@  18:0c049e4e5422@default(draft) add gh
+@  20	: add gh - test
 |
-| o  17:98e171e2f272@default(draft) add gg
+| o  19	: add gg - test
 |/
-o  16:0cf3707e8971@default(draft) a3
+o  18	: a3 - test
 |
-o  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
+o  13	: bumped update to d952e93add6f: - test
 |
-o  10:d952e93add6f@mybranch(public) a2
+o  11	: a2 - test
 |
-o  9:9f8b83c2e7f3@default(public) a1__
+o  10	testbookmark: a1__ - test
 |
-o  0:07c1c36d9ef0@default(public) a0
+o  0	: a0 - test
 Enabling commands selectively, no command enabled, next and fold and unknown
 $ cat >> $HGRCPATH <<EOF
 > [experimental]
 > evolution=createmarkers
 [255]
 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
 $ hg --hidden up 14
-2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-working directory parent is obsolete! (484fb3cfa7f2)
+working directory parent is obsolete! (cce26b684bfe)
 $ cat >> $HGRCPATH <<EOF
 > [experimental]
 > evolutioncommands=evolve
 > EOF
 $ hg --hidden up 15
-1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-working directory parent is obsolete! (daa1ff1c7fbd)
+working directory parent is obsolete! (27247fcb2df6)
-(use 'hg evolve' to update to its successor: 0c049e4e5422)
+(use 'hg evolve' to update to its successor: 24e63b319adf)
 Restore all of the evolution features
 $ cat >> $HGRCPATH <<EOF
 > [experimental]
 > evolution=all
 > EOF
 Check hg evolve --rev on singled out commit
-$ hg up 98e171e2f272 -C
+$ hg up 24e63b319adf -C
-2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ mkcommit j1
 $ mkcommit j2
 $ mkcommit j3
 $ 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
+2 new unstable changesets
-$ glog -r "0cf3707e8971::"
+$ glog -r "edc3c9de504e::"
-@  22:274b6cd0c101@default(draft) add j1
+@  25:8dc373be86d9@default(draft) add j1
 |
-| o  21:89e4f7e8feb5@default(draft) add j3
+| o  23:d7eadcf6eccd@default(draft) add j3
 | |
-| o  20:4cd61236beca@default(draft) add j2
+| o  22:2223ea564144@default(draft) add j2
 | |
-| x  19:0fd8bfb02de4@default(draft) add j1
+| x  21:48490698b269@default(draft) add j1
 |/
-| o  18:0c049e4e5422@default(draft) add gh
+| o  20:e02107f98737@default(draft) add gh
 | |
-o |  17:98e171e2f272@default(draft) add gg
+o |  19:24e63b319adf@default(draft) add gg
 |/
-o  16:0cf3707e8971@default(draft) a3
+o  18:edc3c9de504e@default(draft) a3
 |
 ~
-$ hg evolve --rev 89e4f7e8feb5 --any
+$ hg evolve --rev d7eadcf6eccd --any
 abort: cannot specify both "--rev" and "--any"
 [255]
-$ hg evolve --rev 89e4f7e8feb5
+$ hg evolve --rev d7eadcf6eccd
-cannot solve instability of 89e4f7e8feb5, skipping
+cannot solve instability of d7eadcf6eccd, skipping
 Check that uncommit respects the allowunstable option
 With only createmarkers we can only uncommit on a head
 $ cat >> $HGRCPATH <<EOF
 > [experimental]
 > evolution=createmarkers, allnewcommands
 > EOF
-$ hg up 274b6cd0c101^
+$ hg up 8dc373be86d9^
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 $ hg uncommit --all
 abort: uncommit will orphan 4 descendants
 (see 'hg help evolution.instability')
 [255]
-$ hg up 274b6cd0c101
+$ hg up 8dc373be86d9
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg uncommit --all
 new changeset is empty
 (use 'hg prune .' to remove it)
-$ glog -r "0cf3707e8971::"
+$ glog -r "edc3c9de504e::"
-@  23:0ef9ff75f8e2@default(draft) add j1
+@  26:044804d0c10d@default(draft) add j1
 |
-| o  21:89e4f7e8feb5@default(draft) add j3
+| o  23:d7eadcf6eccd@default(draft) add j3
 | |
-| o  20:4cd61236beca@default(draft) add j2
+| o  22:2223ea564144@default(draft) add j2
 | |
-| x  19:0fd8bfb02de4@default(draft) add j1
+| x  21:48490698b269@default(draft) add j1
 |/
-| o  18:0c049e4e5422@default(draft) add gh
+| o  20:e02107f98737@default(draft) add gh
 | |
-o |  17:98e171e2f272@default(draft) add gg
+o |  19:24e63b319adf@default(draft) add gg
 |/
-o  16:0cf3707e8971@default(draft) a3
+o  18:edc3c9de504e@default(draft) a3
 |
 ~
 Check that prune respects the allowunstable option
 $ hg up -C .
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ hg up 0c049e4e5422
+$ hg up e02107f98737
 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 orphan in the repository, do you want --any or --rev)
 [2]
 $ hg evolve --all --any
-move:[20] add j2
+move:[22] add j2
-atop:[23] add j1
+atop:[26] add j1
-move:[21] add j3
+move:[23] add j3
-atop:[24] add j2
+atop:[27] add j2
-working directory is now at 0d9203b74542
+working directory is now at c9a20e2d74aa
-$ glog -r "0cf3707e8971::"
+$ glog -r "edc3c9de504e::"
-@  25:0d9203b74542@default(draft) add j3
+@  28:c9a20e2d74aa@default(draft) add j3
 |
-o  24:f1b85956c48c@default(draft) add j2
+o  27:b0e3066231e2@default(draft) add j2
 |
-o  23:0ef9ff75f8e2@default(draft) add j1
+o  26:044804d0c10d@default(draft) add j1
 |
-| o  18:0c049e4e5422@default(draft) add gh
+| o  20:e02107f98737@default(draft) add gh
 | |
-o |  17:98e171e2f272@default(draft) add gg
+o |  19:24e63b319adf@default(draft) add gg
 |/
-o  16:0cf3707e8971@default(draft) a3
+o  18:edc3c9de504e@default(draft) a3
 |
 ~
-$ hg up 98e171e2f272
+$ hg up 19
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 $ mkcommit c5_
 created new head
-$ hg prune '0ef9ff75f8e2 + f1b85956c48c'
+$ hg prune '044804d0c10d + b0e3066231e2'
 abort: touch will orphan 1 descendants
 (see 'hg help evolution.instability')
 [255]
-$ hg prune '98e171e2f272::0d9203b74542'
+$ hg prune '24e63b319adf::c9a20e2d74aa'
 abort: touch will orphan 1 descendants
 (see 'hg help evolution.instability')
 [255]
-$ hg prune '0ef9ff75f8e2::'
+$ hg prune '044804d0c10d::'
 3 changesets pruned
-$ glog -r "0cf3707e8971::"
+$ glog -r "edc3c9de504e::"
-@  26:4c6f6f6d1976@default(draft) add c5_
+@  29:2251801b6c91@default(draft) add c5_
 |
-| o  18:0c049e4e5422@default(draft) add gh
+| o  20:e02107f98737@default(draft) add gh
 | |
-o |  17:98e171e2f272@default(draft) add gg
+o |  19:24e63b319adf@default(draft) add gg
 |/
-o  16:0cf3707e8971@default(draft) a3
+o  18:edc3c9de504e@default(draft) a3
 |
 ~
 Check that fold respects the allowunstable option
 (most of this has been moved to test-fold.t)
-$ hg up 0cf3707e8971
+$ hg up edc3c9de504e
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 $ mkcommit unstableifparentisfolded
 created new head
-$ glog -r "0cf3707e8971::"
+$ glog -r "edc3c9de504e::"
-@  27:2d1b55e10be9@default(draft) add unstableifparentisfolded
+@  30:68330ac625b8@default(draft) add unstableifparentisfolded
 |
-| o  26:4c6f6f6d1976@default(draft) add c5_
+| o  29:2251801b6c91@default(draft) add c5_
 | |
-+---o  18:0c049e4e5422@default(draft) add gh
++---o  20:e02107f98737@default(draft) add gh
 | |
-| o  17:98e171e2f272@default(draft) add gg
+| o  19:24e63b319adf@default(draft) add gg
 |/
-o  16:0cf3707e8971@default(draft) a3
+o  18:edc3c9de504e@default(draft) a3
 |
 ~
-$ hg fold --exact "98e171e2f272::"
+$ hg fold --exact "24e63b319adf::"
 2 changesets folded
 Check that evolve shows error while handling split commits
 --------------------------------------
 $ cat >> $HGRCPATH <<EOF
 > [experimental]
 > evolution=all
 > EOF
-$ glog -r "0cf3707e8971::"
+$ glog -r "edc3c9de504e::"
-o  28:92ca6f3984de@default(draft) add gg
+o  31:580886d07058@default(draft) add gg
 |
-| @  27:2d1b55e10be9@default(draft) add unstableifparentisfolded
+| @  30:68330ac625b8@default(draft) add unstableifparentisfolded
 |/
-| o  18:0c049e4e5422@default(draft) add gh
+| o  20:e02107f98737@default(draft) add gh
 |/
-o  16:0cf3707e8971@default(draft) a3
+o  18:edc3c9de504e@default(draft) a3
 |
 ~
 Create a split commit
 $ printf "oo" > oo;
 $ printf "pp" > pp;
 $ hg add oo pp
 $ hg commit -m "oo+pp"
 $ mkcommit uu
-$ hg up 2d1b55e10be9
+$ 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
 $ printf "pp" > pp;
 $ hg add pp
 $ hg commit -m "_pp"
 $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split
 1 changesets pruned
-1 new orphan changesets
+1 new unstable changesets
-$ glog -r "0cf3707e8971::"
+$ glog -r "edc3c9de504e::"
-@  32:c7dbf668e9d5@default(draft) _pp
+@  35:7a555adf2b4a@default(draft) _pp
 |
-o  31:2b5a32114b3d@default(draft) _oo
+o  34:2be4d2d5bf34@default(draft) _oo
 |
-| o  30:4d122571f3b6@default(draft) add uu
+| o  33:53f0c003e03e@default(draft) add uu
 | |
-| x  29:7da3e73df8a5@default(draft) oo+pp
+| x  32:1bf2152f4f82@default(draft) oo+pp
 |/
-| o  28:92ca6f3984de@default(draft) add gg
+| o  31:580886d07058@default(draft) add gg
 | |
-o |  27:2d1b55e10be9@default(draft) add unstableifparentisfolded
+o |  30:68330ac625b8@default(draft) add unstableifparentisfolded
 |/
-| o  18:0c049e4e5422@default(draft) add gh
+| o  20:e02107f98737@default(draft) add gh
 |/
-o  16:0cf3707e8971@default(draft) a3
+o  18:edc3c9de504e@default(draft) a3
 |
 ~
-$ hg evolve --rev "0cf3707e8971::"
+$ hg evolve --rev "edc3c9de504e::"
-move:[30] add uu
+move:[33] add uu
-atop:[32] _pp
+atop:[35] _pp
-working directory is now at be23044af550
+working directory is now at 43c3f5ef149f
 Check that dirstate changes are kept at failure for conflicts (issue4966)
 ----------------------------------------
 $ echo "will be amended" > newfile
 $ hg commit -m "will be amended"
 $ hg parents
-34	: will be amended - test
+37	: will be amended - test
 $ echo "will be evolved safely" >> a
 $ hg commit -m "will be evolved safely"
 $ echo "will cause conflict at evolve" > newfile
 $ echo "newly added" > newlyadded
 $ hg add newlyadded
 $ hg commit -m "will cause conflict at evolve"
-$ glog -r "0cf3707e8971::"
+$ hg update -q 36030b147271
-@  36:59c37c5bebd1@default(draft) will cause conflict at evolve
-|
-o  35:7cc12c6c7862@default(draft) will be evolved safely
-|
-o  34:98c7ab460e6b@default(draft) will be amended
-|
-o  33:be23044af550@default(draft) add uu
-|
-o  32:c7dbf668e9d5@default(draft) _pp
-|
-o  31:2b5a32114b3d@default(draft) _oo
-|
-| o  28:92ca6f3984de@default(draft) add gg
-| |
-o |  27:2d1b55e10be9@default(draft) add unstableifparentisfolded
-|/
-| o  18:0c049e4e5422@default(draft) add gh
-|/
-o  16:0cf3707e8971@default(draft) a3
-|
-~
-$ hg update -q 98c7ab460e6b
 $ echo "amended" > newfile
 $ hg amend -m "amended"
-2 new orphan changesets
+2 new unstable changesets
-$ hg evolve --rev "98c7ab460e6b::"
+$ hg evolve --rev "36030b147271::"
-move:[35] will be evolved safely
+move:[38] will be evolved safely
-atop:[37] amended
+atop:[41] amended
-move:[36] will cause conflict at evolve
+move:[39] will cause conflict at evolve
-atop:[38] will be evolved safely
+atop:[42] will be evolved safely
 merging newfile
 warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
 evolve failed!
 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
 abort: unresolved merge conflicts (see hg help resolve)
 [255]
-$ glog -r "be23044af550::" --hidden
+$ glog -r "43c3f5ef149f::" --hidden
-@  38:61abd81de026@default(draft) will be evolved safely
+@  42:c904da5245b0@default(draft) will be evolved safely
 |
-o  37:df89d30f23e2@default(draft) amended
+o  41:34ae045ec400@default(draft) amended
 |
-| o  36:59c37c5bebd1@default(draft) will cause conflict at evolve
+| x  40:e88bee38ffc2@default(draft) temporary amend commit for 36030b147271
 | |
-| x  35:7cc12c6c7862@default(draft) will be evolved safely
+| | o  39:02e943732647@default(draft) will cause conflict at evolve
-| |
+| | |
-| x  34:98c7ab460e6b@default(draft) will be amended
+| | x  38:f8e30e9317aa@default(draft) will be evolved safely
-|/
+| |/
-o  33:be23044af550@default(draft) add uu
+| x  37:36030b147271@default(draft) will be amended
+|/
+o  36:43c3f5ef149f@default(draft) add uu
 |
 ~
 $ hg status newlyadded
 A newlyadded

branch	mercurial-4.3
changeset 3715	a77fb9669e99
parent 3591	98941c28f3e2
parent 3714	19ec729f3ca2
child 3716	e5ba6531503e