Submitter | phabricator |
---|---|
Date | Aug. 21, 2021, 9:57 a.m. |
Message ID | <differential-rev-PHID-DREV-cferb5wbljyt2ctydpku-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/49645/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py --- a/mercurial/dirstatemap.py +++ b/mercurial/dirstatemap.py @@ -199,8 +199,12 @@ self._map[f] = new_entry if new_entry.dm_nonnormal: self.nonnormalset.add(f) + else: + self.nonnormalset.discard(f) if new_entry.dm_otherparent: self.otherparentset.add(f) + else: + self.otherparentset.discard(f) def reset_state( self,