Show More
@@ -122,7 +122,8 b' testpats = [' | |||
|
122 | 122 | (r'^( *)\t', "don't use tabs to indent"), |
|
123 | 123 | (r'sed (-e )?\'(\d+|/[^/]*/)i(?!\\\n)', |
|
124 | 124 | "put a backslash-escaped newline after sed 'i' command"), |
|
125 | (r'^diff *-\w*u.*$\n(^ \$ |^$)', "prefix diff -u with cmp"), | |
|
125 | (r'^diff *-\w*[uU].*$\n(^ \$ |^$)', "prefix diff -u/-U with cmp"), | |
|
126 | (r'^\s+(if)? diff *-\w*[uU]', "prefix diff -u/-U with cmp"), | |
|
126 | 127 | (r'seq ', "don't use 'seq', use $TESTDIR/seq.py"), |
|
127 | 128 | (r'\butil\.Abort\b', "directly use error.Abort"), |
|
128 | 129 | (r'\|&', "don't use |&, use 2>&1"), |
@@ -460,7 +460,7 b' Force prompts with no input (should be s' | |||
|
460 | 460 | --- file3 --- |
|
461 | 461 | 3 |
|
462 | 462 | changed2 |
|
463 | $ diff -U8 $TESTTMP/fail.status $TESTTMP/prompt.status | |
|
463 | $ cmp $TESTTMP/fail.status $TESTTMP/prompt.status || diff -U8 $TESTTMP/fail.status $TESTTMP/prompt.status | |
|
464 | 464 | |
|
465 | 465 | |
|
466 | 466 | Force prompts |
@@ -583,7 +583,7 b' invocations.)' | |||
|
583 | 583 | > hg resolve --tool ":$tool" --all --config ui.interactive=True |
|
584 | 584 | > status > "$TESTTMP/compare.status" 2>&1 |
|
585 | 585 | > echo '--- diff of status ---' |
|
586 | > if diff -U8 "$TESTTMP/$tool.status" "$TESTTMP/compare.status"; then | |
|
586 | > if cmp "$TESTTMP/$tool.status" "$TESTTMP/compare.status" || diff -U8 "$TESTTMP/$tool.status" "$TESTTMP/compare.status"; then | |
|
587 | 587 | > echo '(status identical)' |
|
588 | 588 | > fi |
|
589 | 589 | > lasttool="$tool" |
@@ -868,7 +868,7 b' Force prompts with no input' | |||
|
868 | 868 | --- file3 --- |
|
869 | 869 | 3 |
|
870 | 870 | changed1 |
|
871 | $ diff -U8 $TESTTMP/fail.status $TESTTMP/prompt.status | |
|
871 | $ cmp $TESTTMP/fail.status $TESTTMP/prompt.status || diff -U8 $TESTTMP/fail.status $TESTTMP/prompt.status | |
|
872 | 872 | |
|
873 | 873 | Choose to merge all files |
|
874 | 874 |
@@ -779,4 +779,4 b' Re-resolve and check status' | |||
|
779 | 779 | warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark') |
|
780 | 780 | [1] |
|
781 | 781 | $ checkstatus > $TESTTMP/status2 2>&1 |
|
782 | $ diff -U8 $TESTTMP/status1 $TESTTMP/status2 | |
|
782 | $ cmp $TESTTMP/status1 $TESTTMP/status2 || diff -U8 $TESTTMP/status1 $TESTTMP/status2 |
General Comments 0
You need to be logged in to leave comments.
Login now