equal
deleted
inserted
replaced
2510 ui.write(('local: %s\n') % record) |
2510 ui.write(('local: %s\n') % record) |
2511 elif rtype == 'O': |
2511 elif rtype == 'O': |
2512 ui.write(('other: %s\n') % record) |
2512 ui.write(('other: %s\n') % record) |
2513 elif rtype == 'm': |
2513 elif rtype == 'm': |
2514 driver, mdstate = record.split('\0', 1) |
2514 driver, mdstate = record.split('\0', 1) |
2515 ui.write(('merge driver: %s (state "%s")\n') % (driver, mdstate)) |
2515 ui.write(('merge driver: %s (state "%s")\n') |
2516 elif rtype == 'F': |
2516 % (driver, mdstate)) |
|
2517 elif rtype in 'FD': |
2517 r = record.split('\0') |
2518 r = record.split('\0') |
2518 f, state, hash, lfile, afile, anode, ofile = r[0:7] |
2519 f, state, hash, lfile, afile, anode, ofile = r[0:7] |
2519 if version == 1: |
2520 if version == 1: |
2520 onode = 'not stored in v1 format' |
2521 onode = 'not stored in v1 format' |
2521 flags = r[7] |
2522 flags = r[7] |