Show More
@@ -929,16 +929,17 b' def debuginstall(ui):' | |||
|
929 | 929 | fa = writetemp("1\n2\n3\n4\n") |
|
930 | 930 | fl = writetemp("1\n2\n3\ninsert\n4\n") |
|
931 | 931 | fr = writetemp("begin\n1\n2\n3\n4\n") |
|
932 |
r = |
|
|
932 | r = util.system('%s "%s" "%s" "%s"' % (cmd, fl, fa, fr)) | |
|
933 | 933 | if r: |
|
934 |
ui.write(_(" |
|
|
934 | ui.write(_(" Got unexpected merge error %d!\n") % r) | |
|
935 | 935 | problems += 1 |
|
936 | 936 | m = file(fl).read() |
|
937 | 937 | if m != "begin\n1\n2\n3\ninsert\n4\n": |
|
938 |
ui.write(_(" |
|
|
938 | ui.write(_(" Got unexpected merge results!\n")) | |
|
939 | 939 | ui.write(_(" (your merge helper may have the" |
|
940 | 940 | " wrong argument order)\n")) |
|
941 | ui.write(m) | |
|
941 | ui.write(_(" Result: %r\n") % m) | |
|
942 | problems += 1 | |
|
942 | 943 | os.unlink(fa) |
|
943 | 944 | os.unlink(fl) |
|
944 | 945 | os.unlink(fr) |
General Comments 0
You need to be logged in to leave comments.
Login now