1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
|
#!/bin/sh
. ${top_srcdir-.}/tests/common.sh
mkdir dir
cat << EOF > dir/file.orig
--
foo
bar
baz
bing
bong
bang
crash
wallop
EOF
cat << EOF > new1
--
foo
bar
baz
bing
bong
bang
crash
wallop
EOF
cat << EOF > new2
b
foo
bar
baz
bing
bong
bang
crash
wallop
thump
EOF
cp new1 dir/file
${DIFF} -u dir/file.orig dir/file > patch1
mkdir dir.modified
mv dir/file.orig dir/file
cp new2 dir.modified/file
${DIFF} -urN dir dir.modified > patch2
${INTERDIFF} patch1 patch2 2>errors > patch1-2 || exit 1
[ -s errors ] && exit 1
mkdir test
cp new1 test/file
cd test
${PATCH} < ../patch1-2 || exit 1
cd ..
cmp new2 test/file || exit 1
|