Mercurial > hg

diff mercurial/mergestate.py @ 45583:9f14bb4d59ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: update _stateextras instead of reassinging `merge.applyupdates()` can store extras for a file and _stateextras may not be empty always. Hence reassigning loses the old values. We can directly update like this because we switched to using `collections.defaultdict` for `_stateextras` sometime ago.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 25 Sep 2020 13:58:05 +0530
parents 590a840fa367
children ecf6d7aa874b
line wrap: on
line diff
--- a/mercurial/mergestate.py	Mon Sep 14 14:11:45 2020 +0530
+++ b/mercurial/mergestate.py	Fri Sep 25 13:58:05 2020 +0530
@@ -261,7 +261,7 @@
             hex(fco.filenode()),
             fcl.flags(),
         ]
-        self._stateextras[fd] = {b'ancestorlinknode': hex(fca.node())}
+        self._stateextras[fd][b'ancestorlinknode'] = hex(fca.node())
         self._dirty = True
 
     def addpathconflict(self, path, frename, forigin):