Mercurial > evolve
diff tests/test-unstability-resolution-result.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 | b1d1f4ade142 |
children | 1328195f76a9 |
line wrap: on
line diff
--- a/tests/test-unstability-resolution-result.t Fri Oct 07 18:14:58 2022 -0400 +++ b/tests/test-unstability-resolution-result.t Fri Oct 07 20:32:14 2022 -0400 @@ -180,10 +180,10 @@ atop:[6] newer a perform evolve? [Ny] y rebasing to destination parent: 66719795a494 - committed as 9bd81588dac8 - working directory is now at 9bd81588dac8 + committed as 1e688a4b6db8 + working directory is now at 1e688a4b6db8 $ glog - @ 11:9bd81588dac8@default(draft) bk:[] phase-divergent update to 99ec7503cf5a: + @ 11:1e688a4b6db8@default(draft) bk:[] phase-divergent update to 99ec7503cf5a: | | o 7:7bc2f5967f5e@default(draft) bk:[] add c | | @@ -198,13 +198,13 @@ # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID 9bd81588dac89b66b4fb6dadd8e33b1ecfe9b408 + # Node ID 1e688a4b6db81db9b647e9045aff0fcbc5c32b8d # Parent 99ec7503cf5a2cd545f41792129becc4172e9e9d phase-divergent update to 99ec7503cf5a: newer a - diff -r 99ec7503cf5a -r 9bd81588dac8 a + diff -r 99ec7503cf5a -r 1e688a4b6db8 a --- a/a Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +1,4 @@