Submitter | phabricator |
---|---|
Date | Sept. 16, 2021, 2:44 p.m. |
Message ID | <differential-rev-PHID-DREV-uruvmatpyhjej6toslin-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/49746/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -401,7 +401,12 @@ source = self._map.copymap.get(f) if source: copies[f] = source - self._normallookup(f) + self._map.reset_state( + f, + wc_tracked=True, + p1_tracked=True, + possibly_dirty=True, + ) # Also fix up otherparent markers elif s.from_p2: source = self._map.copymap.get(f)