Show More
@@ -51,7 +51,6 b" RECORD_LABELS = b'l'" | |||
|
51 | 51 | RECORD_OVERRIDE = b't' |
|
52 | 52 | RECORD_UNSUPPORTED_MANDATORY = b'X' |
|
53 | 53 | RECORD_UNSUPPORTED_ADVISORY = b'x' |
|
54 | RECORD_RESOLVED_OTHER = b'R' | |
|
55 | 54 | |
|
56 | 55 | MERGE_DRIVER_STATE_UNMARKED = b'u' |
|
57 | 56 | MERGE_DRIVER_STATE_MARKED = b'm' |
@@ -220,7 +219,6 b' class mergestate(object):' | |||
|
220 | 219 | RECORD_CHANGEDELETE_CONFLICT, |
|
221 | 220 | RECORD_PATH_CONFLICT, |
|
222 | 221 | RECORD_MERGE_DRIVER_MERGE, |
|
223 | RECORD_RESOLVED_OTHER, | |
|
224 | 222 | ): |
|
225 | 223 | bits = record.split(b'\0') |
|
226 | 224 | self._state[bits[0]] = bits[1:] |
@@ -448,9 +446,7 b' class mergestate(object):' | |||
|
448 | 446 | (RECORD_PATH_CONFLICT, b'\0'.join([filename] + v)) |
|
449 | 447 | ) |
|
450 | 448 | elif v[0] == MERGE_RECORD_MERGED_OTHER: |
|
451 | records.append( | |
|
452 | (RECORD_RESOLVED_OTHER, b'\0'.join([filename] + v)) | |
|
453 | ) | |
|
449 | records.append((RECORD_MERGED, b'\0'.join([filename] + v))) | |
|
454 | 450 | elif v[1] == nullhex or v[6] == nullhex: |
|
455 | 451 | # Change/Delete or Delete/Change conflicts. These are stored in |
|
456 | 452 | # 'C' records. v[1] is the local file, and is nullhex when the |
General Comments 0
You need to be logged in to leave comments.
Login now