Mercurial > public > mercurial-scm > hg-stable
diff mercurial/context.py @ 47745:06d57a91441e
context: use `update_file` instead of `drop` in `markcommitted`
This is the newer, more semantic API.
Differential Revision: https://phab.mercurial-scm.org/D11187
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 19 Jul 2021 03:16:40 +0200 |
| parents | 5bbf304271a0 |
| children | 5437a0254590 |
line wrap: on
line diff
--- a/mercurial/context.py Mon Jul 19 16:21:22 2021 +0200 +++ b/mercurial/context.py Mon Jul 19 03:16:40 2021 +0200 @@ -2026,7 +2026,9 @@ 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()