Show More
@@ -2512,8 +2512,9 b' def debugmergestate(ui, repo, *args):' | |||||
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') |
|
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: |
General Comments 0
You need to be logged in to leave comments.
Login now