Submitter | phabricator |
---|---|
Date | July 25, 2020, 10 a.m. |
Message ID | <differential-rev-PHID-DREV-ecof2r25vxjb7an4pihn-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/46892/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -576,6 +576,11 @@ """ self._actions[filename] = (action, data, message) + def removefile(self, filename): + """ removes a file from the mergeresult object as the file might + not merging anymore """ + del self._actions[filename] + @property def actions(self): return self._actions @@ -1929,7 +1934,7 @@ b'prompt recreating', ) else: - del mresult.actions[f] + mresult.removefile(f) # Convert to dictionary-of-lists format actions = mresult.actionsdict