Mercurial > evolve
comparison tests/test-evolve-obshistory-amend-then-fold.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 | be2008649675 |
| children |
comparison
equal
deleted
inserted
replaced
| 6888:1e836ad40272 | 6889:a66cf9008781 |
|---|---|
| 99 | +B0 | 99 | +B0 |
| 100 | | 100 | |
| 101 | | 101 | |
| 102 x b7ea6d14e664 (3) B1 | 102 x b7ea6d14e664 (3) B1 |
| 103 | folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) | 103 | folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 104 | (No patch available, changesets rebased) | 104 | diff -r b7ea6d14e664 -r eb5a0daa2192+ changeset-description |
| 105 | --- a/changeset-description | |
| 106 | +++ b/changeset-description | |
| 107 | @@ -1,1 +1,1 @@ | |
| 108 | -B1 | |
| 109 | +C0 | |
| 110 | | |
| 105 | | 111 | |
| 106 x 0dec01379d3b (2) B0 | 112 x 0dec01379d3b (2) B0 |
| 107 reworded(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 113 reworded(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 108 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description | 114 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description |
| 109 --- a/changeset-description | 115 --- a/changeset-description |
| 152 | +B0 | 158 | +B0 |
| 153 | | 159 | |
| 154 | | 160 | |
| 155 x b7ea6d14e664 (3) B1 | 161 x b7ea6d14e664 (3) B1 |
| 156 | folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) | 162 | folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 157 | (No patch available, changesets rebased) | 163 | diff -r b7ea6d14e664 -r eb5a0daa2192+ changeset-description |
| 164 | --- a/changeset-description | |
| 165 | +++ b/changeset-description | |
| 166 | @@ -1,1 +1,1 @@ | |
| 167 | -B1 | |
| 168 | +C0 | |
| 169 | | |
| 158 | | 170 | |
| 159 x 0dec01379d3b (2) B0 | 171 x 0dec01379d3b (2) B0 |
| 160 reworded(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 172 reworded(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 161 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description | 173 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description |
| 162 --- a/changeset-description | 174 --- a/changeset-description |