# HG changeset patch # User Pierre-Yves David # Date 2021-07-19 01:16:40 # Node ID 06d57a91441ebd7ed6cddf2467992ed7f472dc34 # Parent 372ff4638cb4f5f78478ae62036357a0fca51966 context: use `update_file` instead of `drop` in `markcommitted` This is the newer, more semantic API. Differential Revision: https://phab.mercurial-scm.org/D11187 diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -2026,7 +2026,9 @@ class workingctx(committablectx): f, p1_tracked=True, wc_tracked=True ) for f in self.removed(): - self._repo.dirstate.drop(f) + self._repo.dirstate.update_file( + f, p1_tracked=False, wc_tracked=False + ) self._repo.dirstate.setparents(node) self._repo._quick_access_changeid_invalidate()