Show More
@@ -61,6 +61,8 b' class mergestate(object):' | |||
|
61 | 61 | L: the node of the "local" part of the merge (hexified version) |
|
62 | 62 | O: the node of the "other" part of the merge (hexified version) |
|
63 | 63 | F: a file to be merged entry |
|
64 | D: a file that the external merge driver will merge internally | |
|
65 | (experimental) | |
|
64 | 66 | m: the external merge driver defined for this merge plus its run state |
|
65 | 67 | (experimental) |
|
66 | 68 | |
@@ -125,7 +127,7 b' class mergestate(object):' | |||
|
125 | 127 | _("merge driver changed since merge started"), |
|
126 | 128 | hint=_("revert merge driver change or abort merge")) |
|
127 | 129 | self._mdstate = mdstate |
|
128 |
elif rtype |
|
|
130 | elif rtype in 'FD': | |
|
129 | 131 | bits = record.split('\0') |
|
130 | 132 | self._state[bits[0]] = bits[1:] |
|
131 | 133 | elif not rtype.islower(): |
@@ -254,6 +256,9 b' class mergestate(object):' | |||
|
254 | 256 | records.append(('m', '\0'.join([ |
|
255 | 257 | self.mergedriver, self._mdstate]))) |
|
256 | 258 | for d, v in self._state.iteritems(): |
|
259 | if v[0] == 'd': | |
|
260 | records.append(('D', '\0'.join([d] + v))) | |
|
261 | else: | |
|
257 | 262 | records.append(('F', '\0'.join([d] + v))) |
|
258 | 263 | self._writerecords(records) |
|
259 | 264 | self._dirty = False |
General Comments 0
You need to be logged in to leave comments.
Login now