Mercurial > evolve
diff tests/test-evolve-phase-divergence.t @ 6889:a66cf9008781
obslog: also display patch for rebased changesets
This applies the same logic that is used for "merge-diff" to rebased
changesets. The successors' content is compared to the content of the
predecessors rebased in-memory on the new parents.
This highlights the changes that were actually introduced while rebasing (like
conflict resolution or API adjustment).
As a side effect, obslog now also outputs slightly more diffs for splits,
showing what parts of the original big changeset were moved to the smaller
split components (but for now it only works for the first few changesets).
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 22 Sep 2024 02:58:54 +0200 |
| parents | 53d63b608230 |
| children |
line wrap: on
line diff
--- a/tests/test-evolve-phase-divergence.t Sun Sep 22 12:20:03 2024 +0200 +++ b/tests/test-evolve-phase-divergence.t Sun Sep 22 02:58:54 2024 +0200 @@ -1832,7 +1832,14 @@ $ hg obslog --patch @ 9eebcb77a7e2 (3) phase-divergent update to 3074c7249d20: | rewritten(description, parent, content) from 599454370881 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) - | (No patch available, changesets rebased) + | diff -r 599454370881+ -r 9eebcb77a7e2 changeset-description + | --- a/changeset-description + | +++ b/changeset-description + | @@ -1,1 +1,3 @@ + | +phase-divergent update to 3074c7249d20: + | + + | E2 + | | x 599454370881 (2) E2 | rewritten(description, content) from 3074c7249d20 using amend by test (Thu Jan 01 00:00:00 1970 +0000)