##// END OF EJS Templates
merge: update commitinfo from all mergeresults during bid merge...
Pulkit Goyal -
r46042:6e474eec default
parent child Browse files
Show More
@@ -1130,6 +1130,7 b' def calculateupdates('
1130 1130 # mapping of following form:
1131 1131 # {ACTION_X : [info, ..], ACTION_Y : [info, ..]}
1132 1132 fbids = {}
1133 mresult = mergeresult()
1133 1134 diverge, renamedelete = None, None
1134 1135 for ancestor in ancestors:
1135 1136 repo.ui.note(_(b'\ncalculating bids for ancestor %s\n') % ancestor)
@@ -1156,6 +1157,12 b' def calculateupdates('
1156 1157 ):
1157 1158 renamedelete = mresult1.renamedelete
1158 1159
1160 # blindly update final mergeresult commitinfo with what we get
1161 # from mergeresult object for each ancestor
1162 # TODO: some commitinfo depends on what bid merge choose and hence
1163 # we will need to make commitinfo also depend on bid merge logic
1164 mresult._commitinfo.update(mresult1._commitinfo)
1165
1159 1166 for f, a in mresult1.filemap(sort=True):
1160 1167 m, args, msg = a
1161 1168 repo.ui.debug(b' %s: %s -> %s\n' % (f, msg, m))
@@ -1174,7 +1181,6 b' def calculateupdates('
1174 1181 _(b'\nauction for merging merge bids (%d ancestors)\n')
1175 1182 % len(ancestors)
1176 1183 )
1177 mresult = mergeresult()
1178 1184 for f, bids in sorted(fbids.items()):
1179 1185 if repo.ui.debugflag:
1180 1186 repo.ui.debug(b" list of bids for %s:\n" % f)
General Comments 0
You need to be logged in to leave comments. Login now