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