diff 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).

--- a/CHANGELOG	Thu Sep 03 09:21:58 2020 -0700
+++ b/CHANGELOG	Wed Aug 26 00:05:52 2020 -0700
@@ -11,6 +11,7 @@
     into more than one commit
 
   * revset: no longer changeset without topic when running `topic(REVSET)`
+  * uncommit: fix situation where added file would be left in a wrong state
 
 10.0.1 -- 2020-07-31
 --------------------