Mercurial > evolve
diff tests/test-evolve-content-divergent-case-B1.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 | 43a5371fa669 |
children |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-case-B1.t Fri Oct 07 18:14:58 2022 -0400 +++ b/tests/test-evolve-content-divergent-case-B1.t Fri Oct 07 20:32:14 2022 -0400 @@ -137,7 +137,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg log -G - o 9:6f740085e668 (draft): new_B + o 9:55f09418c9b0 (draft): new_B | @ 5:45ed635c7cfc (draft): latest_A | @@ -181,10 +181,10 @@ base: [2] B rebasing "divergent" content-divergent changeset 807cc2b37fb3 on 1ffcccee011c 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at 2431e876af63 + working directory is now at 6b611864f3f6 $ hg log -G - @ 8:2431e876af63 (draft): new_B [orphan] + @ 8:6b611864f3f6 (draft): new_B [orphan] | | o 6:45ed635c7cfc (draft): latest_A | | @@ -193,6 +193,6 @@ o 0:a9bdc8b26820 (public): O $ hg evolve -l - 2431e876af63: new_B + 6b611864f3f6: new_B orphan: 1ffcccee011c (obsolete parent)