Submitter | phabricator |
---|---|
Date | Oct. 2, 2021, 3:05 p.m. |
Message ID | <differential-rev-PHID-DREV-hvji6idbayylijcp5ve3-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/49893/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py --- a/mercurial/dirstatemap.py +++ b/mercurial/dirstatemap.py @@ -479,10 +479,9 @@ self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added) if not entry.merged: self.copymap.pop(f, None) - if entry.added: + entry.set_untracked() + if not entry.any_tracked: self._map.pop(f, None) - else: - entry.set_untracked() return True