Mercurial > evolve
diff tests/test-evolve-public-content-divergent-corner-cases.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 | 9a41c3c293ae a66cf9008781 |
line wrap: on
line diff
--- a/tests/test-evolve-public-content-divergent-corner-cases.t Fri Oct 07 18:14:58 2022 -0400 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Fri Oct 07 20:32:14 2022 -0400 @@ -137,14 +137,14 @@ base: [2] added c rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - committed as 0941937e8302 - working directory is now at 0941937e8302 + committed as a3019c73de83 + working directory is now at a3019c73de83 $ hg glog -p - @ 8:0941937e8302 phase-divergent update to c0d7ee6604ea: + @ 8:a3019c73de83 phase-divergent update to c0d7ee6604ea: | draft | - | diff -r c0d7ee6604ea -r 0941937e8302 c + | diff -r c0d7ee6604ea -r a3019c73de83 c | --- a/c Thu Jan 01 00:00:00 1970 +0000 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | @@ -1,1 +1,2 @@