Mercurial > evolve
diff tests/test-evolve-topic.t @ 6317:53d63b608230
evolve: stop preserving all of {extras} for uninterrupted evolve operations
I doubt the wisdom of doing this, but the case of completing interrupted evolves
does this, as do core commands for amend, graft, and rebase in hg ce9696193175,
bb14a81ce647, and b698abf971e7.
Note the obslog order (and DAG display) change in test-evolve-content-divergent-relocation.t
around line 131. I have no idea why that would happen, or if it's an indicator
of something subtle going on.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Fri, 07 Oct 2022 20:32:14 -0400 |
| parents | 2800aa3c3dbf |
| children | 1328195f76a9 9da0114a8a02 |
line wrap: on
line diff
--- a/tests/test-evolve-topic.t Fri Oct 07 18:14:58 2022 -0400 +++ b/tests/test-evolve-topic.t Fri Oct 07 20:32:14 2022 -0400 @@ -128,9 +128,9 @@ move:[s3] add eee atop:[s2] add ddd move:[s4] add fff - working directory is now at 070c5573d8f9 + working directory is now at ad43ddbeead9 $ hg log -G - @ 13 - {foo} 070c5573d8f9 add fff (draft) + @ 13 - {foo} ad43ddbeead9 add fff (draft) | o 12 - {foo} 42b49017ff90 add eee (draft) | @@ -166,17 +166,17 @@ move:[7] add hhh move:[8] add iii move:[9] add jjj - working directory is now at 9bf430c106b7 + working directory is now at fed0f67a2171 $ hg log -G - @ 17 - {bar} 9bf430c106b7 add jjj (draft) + @ 17 - {bar} fed0f67a2171 add jjj (draft) | - o 16 - {bar} d2dc89c57700 add iii (draft) + o 16 - {bar} 94e899639b23 add iii (draft) | - o 15 - {bar} 20bc4d02aa62 add hhh (draft) + o 15 - {bar} 55e5cd2b6cd6 add hhh (draft) | - o 14 - {bar} 16d6f664b17c add ggg (draft) + o 14 - {bar} 56107a7ddeaf add ggg (draft) | - o 13 - {foo} 070c5573d8f9 add fff (draft) + o 13 - {foo} ad43ddbeead9 add fff (draft) | o 12 - {foo} 42b49017ff90 add eee (draft) | @@ -227,15 +227,15 @@ Testing when instability is involved $ hg log -G - o 17 - {bar} 9bf430c106b7 add jjj (draft) + o 17 - {bar} fed0f67a2171 add jjj (draft) | - o 16 - {bar} d2dc89c57700 add iii (draft) + o 16 - {bar} 94e899639b23 add iii (draft) | - o 15 - {bar} 20bc4d02aa62 add hhh (draft) + o 15 - {bar} 55e5cd2b6cd6 add hhh (draft) | - o 14 - {bar} 16d6f664b17c add ggg (draft) + o 14 - {bar} 56107a7ddeaf add ggg (draft) | - o 13 - {foo} 070c5573d8f9 add fff (draft) + o 13 - {foo} ad43ddbeead9 add fff (draft) | @ 12 - {foo} 42b49017ff90 add eee (draft) | @@ -247,12 +247,12 @@ | o 0 - {} 199cc73e9a0b add aaa (draft) - $ hg topic -r 070c5573d8f9 bar + $ hg topic -r ad43ddbeead9 bar 4 new orphan changesets changed topic on 1 changesets to "bar" $ hg log -r 18 -T '{rev}: {join(extras, " ")}\n' - 18: _rewrite_noise=[0-9a-f]+ amend_source=[0-9a-f]+ branch=default rebase_source=[0-9a-f]+ topic=bar (re) - $ hg up 16d6f664b17c + 18: _rewrite_noise=[0-9a-f]+ branch=default rebase_source=[0-9a-f]+ topic=bar (re) + $ hg up 56107a7ddeaf switching to topic bar 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -274,17 +274,17 @@ ------------------------------------------------------------------------------ $ hg log --graph - @ 18 - {bar} c80027c7cda1 add fff (draft) + @ 18 - {bar} 8dde0971132d add fff (draft) | - | * 17 - {bar} 9bf430c106b7 add jjj (draft) + | * 17 - {bar} fed0f67a2171 add jjj (draft) | | - | * 16 - {bar} d2dc89c57700 add iii (draft) + | * 16 - {bar} 94e899639b23 add iii (draft) | | - | * 15 - {bar} 20bc4d02aa62 add hhh (draft) + | * 15 - {bar} 55e5cd2b6cd6 add hhh (draft) | | - | * 14 - {bar} 16d6f664b17c add ggg (draft) + | * 14 - {bar} 56107a7ddeaf add ggg (draft) | | - | x 13 - {foo} 070c5573d8f9 add fff (draft) + | x 13 - {foo} ad43ddbeead9 add fff (draft) |/ o 12 - {foo} 42b49017ff90 add eee (draft) | @@ -303,24 +303,24 @@ When the current topic, obsoleted changesets topic and successor topic are same - $ hg up 20bc4d02aa62 + $ hg up 55e5cd2b6cd6 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo foobar >> hhh $ hg amend - $ hg up 20bc4d02aa62 + $ hg up 55e5cd2b6cd6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory parent is obsolete! (20bc4d02aa62) - (use 'hg evolve' to update to its successor: d834582d9ee3) + working directory parent is obsolete! (55e5cd2b6cd6) + (use 'hg evolve' to update to its successor: 604c23b08613) $ hg log -Gr 14:: - * 19 - {bar} d834582d9ee3 add hhh (draft) + * 19 - {bar} 604c23b08613 add hhh (draft) | - | * 17 - {bar} 9bf430c106b7 add jjj (draft) + | * 17 - {bar} fed0f67a2171 add jjj (draft) | | - | * 16 - {bar} d2dc89c57700 add iii (draft) + | * 16 - {bar} 94e899639b23 add iii (draft) | | - | @ 15 - {bar} 20bc4d02aa62 add hhh (draft) + | @ 15 - {bar} 55e5cd2b6cd6 add hhh (draft) |/ - * 14 - {bar} 16d6f664b17c add ggg (draft) + * 14 - {bar} 56107a7ddeaf add ggg (draft) | ~ @@ -331,33 +331,33 @@ When the current topic and successors topic are same, but obsolete cset has different topic - $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= - rebasing 16:d2dc89c57700 bar "add iii" + $ hg rebase -s 94e899639b23 -d 604c23b08613 --config extensions.rebase= + rebasing 16:94e899639b23 bar "add iii" 1 new orphan changesets - rebasing 17:9bf430c106b7 bar "add jjj" + rebasing 17:fed0f67a2171 bar "add jjj" 1 new orphan changesets $ hg log -Gr 42b49017ff90:: - * 21 - {bar} 7542e76aba2c add jjj (draft) + * 21 - {bar} 573bbc059289 add jjj (draft) | - * 20 - {bar} 7858bd7e9906 add iii (draft) + * 20 - {bar} 8e94e3065186 add iii (draft) | - * 19 - {bar} d834582d9ee3 add hhh (draft) + * 19 - {bar} 604c23b08613 add hhh (draft) | - | o 18 - {bar} c80027c7cda1 add fff (draft) + | o 18 - {bar} 8dde0971132d add fff (draft) | | - @ | 14 - {bar} 16d6f664b17c add ggg (draft) + @ | 14 - {bar} 56107a7ddeaf add ggg (draft) | | - x | 13 - {foo} 070c5573d8f9 add fff (draft) + x | 13 - {foo} ad43ddbeead9 add fff (draft) |/ o 12 - {foo} 42b49017ff90 add eee (draft) | ~ - $ hg up 070c5573d8f9 + $ hg up ad43ddbeead9 switching to topic foo 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - working directory parent is obsolete! (070c5573d8f9) - (use 'hg evolve' to update to its successor: c80027c7cda1) + working directory parent is obsolete! (ad43ddbeead9) + (use 'hg evolve' to update to its successor: 8dde0971132d) $ hg topic bar @@ -369,7 +369,7 @@ When current topic and obsolete cset topic are same but successor has different one - $ hg up 070c5573d8f9 + $ hg up ad43ddbeead9 switching to topic foo 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg prev @@ -392,17 +392,17 @@ $ hg ci --amend 4 new orphan changesets $ hg log -G - @ 26 - {bar} 239dcab64bc0 add fff (draft) + @ 26 - {bar} 235873f1950b add fff (draft) | - | * 25 - {bar} e49f8682fb23 add jjj (draft) + | * 25 - {bar} ed0b505ff189 add jjj (draft) | | - | * 24 - {bar} 318094e157e3 add iii (draft) + | * 24 - {bar} 50b1b9387d50 add iii (draft) | | - | * 23 - {bar} aa8b0df2da21 add hhh (draft) + | * 23 - {bar} 0d4bb3a72a5b add hhh (draft) | | - | * 22 - {bar} 310e9f9bceb1 add ggg (draft) + | * 22 - {bar} 548702c1d91c add ggg (draft) | | - | x 18 - {bar} c80027c7cda1 add fff (draft) + | x 18 - {bar} 8dde0971132d add fff (draft) |/ o 12 - {foo} 42b49017ff90 add eee (draft) | @@ -428,7 +428,7 @@ (no more unresolved files) continue: hg evolve --continue $ hg evolve --continue - evolving 23:aa8b0df2da21 "add hhh" + evolving 23:0d4bb3a72a5b "add hhh" move:[s4] add iii atop:[s3] add hhh move:[s5] add jjj @@ -441,13 +441,13 @@ switching to topic foo 2 files updated, 0 files merged, 1 files removed, 0 files unresolved updated to hidden changeset 6a6b7365c751 - (hidden revision '6a6b7365c751' was rewritten as: 239dcab64bc0) + (hidden revision '6a6b7365c751' was rewritten as: 235873f1950b) working directory parent is obsolete! (6a6b7365c751) - (use 'hg evolve' to update to its successor: 239dcab64bc0) + (use 'hg evolve' to update to its successor: 235873f1950b) Evolve: $ hg evolve update:[26] add fff switching to topic bar 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at 239dcab64bc0 + working directory is now at 235873f1950b