mercurial/mergestate.py
changeset 45405 05d19ca33b33
parent 45402 0652a533fe3c
child 45478 bb9888d32601
--- a/mercurial/mergestate.py	Mon Aug 10 15:38:45 2020 +0530
+++ b/mercurial/mergestate.py	Mon Aug 10 15:47:21 2020 +0530
@@ -592,8 +592,10 @@
         self._state[path] = [MERGE_RECORD_UNRESOLVED_PATH, frename, forigin]
         self._dirty = True
 
-    def addmergedother(self, path):
-        self._stateextras[path] = {b'filenode-source': b'other'}
+    def addcommitinfo(self, path, data):
+        """ stores information which is required at commit
+        into _stateextras """
+        self._stateextras[path].update(data)
         self._dirty = True
 
     def __contains__(self, dfile):