Mercurial > evolve
comparison CHANGELOG @ 5512:2df762b9c0c5 stable
dirstate: replace _uncommitdirstate() by core's movedirstate()
IIRC, when _uncommitdirstate() was upstreamed, it got cleaned up a
lot. Let's switch to the simpler upstream version.
This fixes the brokeness in `hg uncommit` demonstrated by the previous
patch. The problem was that _uncommitdirstate() had not been properly
updated to support uncommitting to another commit. If you replace
`oldctx.p1()` by `ctx` there, you would get this same diff as from
this patch (the `interactive` code path had been fixed this way
already).
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 26 Aug 2020 00:05:52 -0700 |
| parents | 95478db35f88 |
| children | 13e589fb61f5 |
comparison
equal
deleted
inserted
replaced
| 5511:80b5d4b85a52 | 5512:2df762b9c0c5 |
|---|---|
| 9 | 9 |
| 10 * split: correctly handle discard action after previously splitting changes | 10 * split: correctly handle discard action after previously splitting changes |
| 11 into more than one commit | 11 into more than one commit |
| 12 | 12 |
| 13 * revset: no longer changeset without topic when running `topic(REVSET)` | 13 * revset: no longer changeset without topic when running `topic(REVSET)` |
| 14 * uncommit: fix situation where added file would be left in a wrong state | |
| 14 | 15 |
| 15 10.0.1 -- 2020-07-31 | 16 10.0.1 -- 2020-07-31 |
| 16 -------------------- | 17 -------------------- |
| 17 | 18 |
| 18 * compatibility with Mercurial 5.5 | 19 * compatibility with Mercurial 5.5 |