Mercurial > evolve
comparison CHANGELOG @ 4722:7839720c7c75
rewind: make sure merge commits include files from p1 and p2
Otherwise rewinding a merge commit makes it lose all changes.
This fix populates `updates` argument of rewriteutil.rewrite() with parent
changesets. That argument is normally used for folding multiple changesets, but
in this case it's simply used to include files from p1 and p2. Usually,
rewrite() works fine using ctx.files(), but that function can return an empty
list when ctx is a merge commit.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 11 Jul 2019 17:04:08 +0800 |
| parents | 0e0731406efd |
| children | 41885988921e |
comparison
equal
deleted
inserted
replaced
| 4721:b69497b23d31 | 4722:7839720c7c75 |
|---|---|
| 7 * evolve: use the same wording as core in case of unresolved conflict | 7 * evolve: use the same wording as core in case of unresolved conflict |
| 8 * evolve: minor output message improvements | 8 * evolve: minor output message improvements |
| 9 * evolve: improve `hg evolve --all` behavior when "." is obsolete | 9 * evolve: improve `hg evolve --all` behavior when "." is obsolete |
| 10 * topic: fix confusion in branch heads checking logic | 10 * topic: fix confusion in branch heads checking logic |
| 11 * touch: now works on merge commit too | 11 * touch: now works on merge commit too |
| 12 * rewind: fix behavior for merge commit | |
| 12 | 13 |
| 13 9.0.1 - in progress | 14 9.0.1 - in progress |
| 14 ------------------- | 15 ------------------- |
| 15 | 16 |
| 16 * pick: no longer forget file in case of conflict (issue6037) | 17 * pick: no longer forget file in case of conflict (issue6037) |