Submitter | phabricator |
---|---|
Date | Sept. 14, 2021, 9:20 p.m. |
Message ID | <differential-rev-PHID-DREV-hdyenevw5pq6ijufpmc4-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/49721/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -496,13 +496,13 @@ entry = self._map.get(filename) if entry is None: return False - elif entry.added: - self._drop(filename) - return True else: self._dirty = True self._updatedfiles.add(filename) - self._map.set_untracked(filename) + if entry.added: + self._map.dropfile(filename) + else: + self._map.set_untracked(filename) return True @requires_no_parents_change