Show More
@@ -202,15 +202,12 b' class mergestate(object):' | |||||
202 | def reset(self, node=None, other=None, labels=None): |
|
202 | def reset(self, node=None, other=None, labels=None): | |
203 | self._state = {} |
|
203 | self._state = {} | |
204 | self._stateextras = collections.defaultdict(dict) |
|
204 | self._stateextras = collections.defaultdict(dict) | |
205 |
self._local = |
|
205 | self._local = node | |
206 |
self._other = |
|
206 | self._other = other | |
207 | self._labels = labels |
|
207 | self._labels = labels | |
208 | for var in ('localctx', 'otherctx'): |
|
208 | for var in ('localctx', 'otherctx'): | |
209 | if var in vars(self): |
|
209 | if var in vars(self): | |
210 | delattr(self, var) |
|
210 | delattr(self, var) | |
211 | if node: |
|
|||
212 | self._local = node |
|
|||
213 | self._other = other |
|
|||
214 | self._readmergedriver = None |
|
211 | self._readmergedriver = None | |
215 | if self.mergedriver: |
|
212 | if self.mergedriver: | |
216 | self._mdstate = MERGE_DRIVER_STATE_SUCCESS |
|
213 | self._mdstate = MERGE_DRIVER_STATE_SUCCESS |
General Comments 0
You need to be logged in to leave comments.
Login now