Changeset View
Changeset View
Standalone View
Standalone View
tests/test-merge-combination.t
| Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Line(s) | revision. "C" indicates that hg merge had conflicts. | ||||
| > fi | > fi | ||||
| > elif [ $m = $r2 ] | > elif [ $m = $r2 ] | ||||
| > then if [ $base = $r1 ] | > then if [ $base = $r1 ] | ||||
| > then expected= | > then expected= | ||||
| > else expected=a | > else expected=a | ||||
| > fi | > fi | ||||
| > else expected=a | > else expected=a | ||||
| > fi | > fi | ||||
| > got=`hg log -r 3 --template '{files}\n' | tr --delete 'e '` | > got=`hg log -r 3 --template '{files}\n' | tr -d 'e '` | ||||
| > if [ "$got" = "$expected" ] | > if [ "$got" = "$expected" ] | ||||
| > then echo "$line$conflicts: agree on \"$got\"" | > then echo "$line$conflicts: agree on \"$got\"" | ||||
| > else echo "$line$conflicts: hg said \"$got\", expected \"$expected\"" | > else echo "$line$conflicts: hg said \"$got\", expected \"$expected\"" | ||||
| > fi | > fi | ||||
| > cd ../ | > cd ../ | ||||
| > rm -rf repo | > rm -rf repo | ||||
| > done | > done | ||||
| > done | > done | ||||
| ▲ Show 20 Lines • Show All 152 Lines • Show Last 20 Lines | |||||