Show More
@@ -114,6 +114,7 b' class mergestate(object):' | |||||
114 | else: |
|
114 | else: | |
115 | self._mdstate = 'u' |
|
115 | self._mdstate = 'u' | |
116 | shutil.rmtree(self._repo.join('merge'), True) |
|
116 | shutil.rmtree(self._repo.join('merge'), True) | |
|
117 | self._results = {} | |||
117 | self._dirty = False |
|
118 | self._dirty = False | |
118 |
|
119 | |||
119 | def _read(self): |
|
120 | def _read(self): | |
@@ -150,6 +151,7 b' class mergestate(object):' | |||||
150 | self._state[bits[0]] = bits[1:] |
|
151 | self._state[bits[0]] = bits[1:] | |
151 | elif not rtype.islower(): |
|
152 | elif not rtype.islower(): | |
152 | unsupported.add(rtype) |
|
153 | unsupported.add(rtype) | |
|
154 | self._results = {} | |||
153 | self._dirty = False |
|
155 | self._dirty = False | |
154 |
|
156 | |||
155 | if unsupported: |
|
157 | if unsupported: | |
@@ -466,6 +468,7 b' class mergestate(object):' | |||||
466 | elif fco.isabsent(): # cd: local picked |
|
468 | elif fco.isabsent(): # cd: local picked | |
467 | action = 'a' |
|
469 | action = 'a' | |
468 | # else: regular merges (no action necessary) |
|
470 | # else: regular merges (no action necessary) | |
|
471 | self._results[dfile] = r, action | |||
469 |
|
472 | |||
470 | return complete, r, action |
|
473 | return complete, r, action | |
471 |
|
474 |
General Comments 0
You need to be logged in to leave comments.
Login now