Changed "diff -c" to "diff -u".
authorWayne Davison <wayned@samba.org>
Fri, 4 Jul 2003 23:56:59 +0000 (23:56 +0000)
committerWayne Davison <wayned@samba.org>
Fri, 4 Jul 2003 23:56:59 +0000 (23:56 +0000)
testsuite/rsync.fns
testsuite/trimslash.test

index 42b7b7e..7cc7ad0 100644 (file)
@@ -157,7 +157,7 @@ checkit() {
     echo ""
     for f in `cd "$2"; find . -type f -print `
     do 
-        diff -c "$2"/"$f" "$3"/"$f" || failed=YES
+        diff -u "$2"/"$f" "$3"/"$f" || failed=YES
     done
 
     echo "-------------"
@@ -165,7 +165,7 @@ checkit() {
     echo ""
     ( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from 
     ( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to 
-    diff -c ${TMP}/ls-from ${TMP}/ls-to || failed=YES
+    diff -u ${TMP}/ls-from ${TMP}/ls-to || failed=YES
     if [ -z "${failed}" ] ; then
        return 0
     else
index cf11840..b2b8855 100644 (file)
@@ -15,7 +15,7 @@ set -x
        "//a//" "////" \
         "/Users/Wierd Macintosh Name/// Ooh, translucent plastic/" \
        > "$scratchdir/slash.out"
-diff -c "$scratchdir/slash.out" - <<EOF
+diff -u "$scratchdir/slash.out" - <<EOF
 /usr/local/bin
 /usr/local/bin
 /usr/local/bin