Mercurial > evolve
comparison CHANGELOG @ 5571:b2de5825e5ca
evolve: don't set evolved node as dirstate p2
Upstream rebase changed in 9c9cfecd4600 (rebase: don't use rebased
node as dirstate p2 (BC), 2020-01-10) so the dirstate parents are
always the commits that will be parents once the commit has been
created. Let's follow their lead so the experience is consistent.
The drawback is that users who use Evolve with older Mercurial
versions will not see in `hg log -G` output which commit is being
evolved.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 25 Sep 2020 11:06:46 -0700 |
| parents | 15cc99069c57 |
| children | ba8bc1b0acd2 |
comparison
equal
deleted
inserted
replaced
| 5570:15cc99069c57 | 5571:b2de5825e5ca |
|---|---|
| 6 | 6 |
| 7 * numerous minor changes to packaging, README moved to README.rst | 7 * numerous minor changes to packaging, README moved to README.rst |
| 8 * metaedit: update bookmark location when applicable | 8 * metaedit: update bookmark location when applicable |
| 9 * evolve: fix various issues with --continue when solving content-divergence | 9 * evolve: fix various issues with --continue when solving content-divergence |
| 10 * rewind: add a --dry-run flag | 10 * rewind: add a --dry-run flag |
| 11 * evolve: while resolving conflicts, the evolved node will no longer be a | |
| 12 dirstate parent (won't show up in `hg parents` and not as `@` in `hg log -G`, | |
| 13 but it will show up as `%` with hg >= 5.4) | |
| 11 | 14 |
| 12 topic (0.20.0) | 15 topic (0.20.0) |
| 13 | 16 |
| 14 * stack: support foo#stack relation revset (hg-5.4+ only) | 17 * stack: support foo#stack relation revset (hg-5.4+ only) |
| 15 | 18 |