# HG changeset patch # User Pierre-Yves David # Date 2021-09-29 13:40:13 # Node ID e0d566f3ffce92ff66bae7c3ff2b7cf17f68e2b2 # Parent ba79d99ec1ae391f599432c06ad37e9ae906f70c dirstate-item: use `any_tracked` instead of `state` to apply patches Differential Revision: https://phab.mercurial-scm.org/D11536 diff --git a/mercurial/patch.py b/mercurial/patch.py --- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -550,7 +550,9 @@ class workingbackend(fsbackend): self.copied = [] def _checkknown(self, fname): - if self.repo.dirstate[fname] == b'?' and self.exists(fname): + if not self.repo.dirstate.get_entry(fname).any_tracked and self.exists( + fname + ): raise PatchError(_(b'cannot patch %s: file is not tracked') % fname) def setfile(self, fname, data, mode, copysource):