Show More
@@ -622,6 +622,9 b' class mergeresult(object):' | |||||
622 | def setactions(self, actions): |
|
622 | def setactions(self, actions): | |
623 | self._actions = actions |
|
623 | self._actions = actions | |
624 |
|
624 | |||
|
625 | def updateactions(self, updates): | |||
|
626 | self._actions.update(updates) | |||
|
627 | ||||
625 | def hasconflicts(self): |
|
628 | def hasconflicts(self): | |
626 | """ tells whether this merge resulted in some actions which can |
|
629 | """ tells whether this merge resulted in some actions which can | |
627 | result in conflicts or not """ |
|
630 | result in conflicts or not """ | |
@@ -1125,7 +1128,7 b' def calculateupdates(' | |||||
1125 |
|
1128 | |||
1126 | if wctx.rev() is None: |
|
1129 | if wctx.rev() is None: | |
1127 | fractions = _forgetremoved(wctx, mctx, branchmerge) |
|
1130 | fractions = _forgetremoved(wctx, mctx, branchmerge) | |
1128 |
mresult.actions |
|
1131 | mresult.updateactions(fractions) | |
1129 |
|
1132 | |||
1130 | prunedactions = sparse.filterupdatesactions( |
|
1133 | prunedactions = sparse.filterupdatesactions( | |
1131 | repo, wctx, mctx, branchmerge, mresult.actions |
|
1134 | repo, wctx, mctx, branchmerge, mresult.actions |
General Comments 0
You need to be logged in to leave comments.
Login now