[Updated] D11188: amend: use `update_file` instead of `drop`

[marmoute (Pierre-Yves David)]

Closed by commit rHG56297381af90: amend: use `update_file` instead of `drop` (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11188?vs=29581&id=29689

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11188/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D11188

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -3004,7 +3004,7 @@
             # to "removed" in the dirstate.
             removedfiles = set(wctx.removed()) & filestoamend
             for f in removedfiles:
-                dirstate.drop(f)
+                dirstate.update_file(f, p1_tracked=False, wc_tracked=False)
 
         mapping = {old.node(): (newid,)}
         obsmetadata = None



To: marmoute, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210720/92d7d3cb/attachment-0002.html>