Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fb22c27
)
Use $diffopt instead of -u.
author
Wayne Davison
<wayned@samba.org>
Mon, 20 Sep 2004 05:17:57 +0000
(
05:17
+0000)
committer
Wayne Davison
<wayned@samba.org>
Mon, 20 Sep 2004 05:17:57 +0000
(
05:17
+0000)
testsuite/backup.test
patch
|
blob
|
blame
|
history
diff --git
a/testsuite/backup.test
b/testsuite/backup.test
index
5928362
..
9e4b023
100644
(file)
--- a/
testsuite/backup.test
+++ b/
testsuite/backup.test
@@
-26,14
+26,14
@@
echo "Extending the other file" >> "$name2"
checkit "$RSYNC -avv --backup --backup-dir=\"$bakdir\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
checkit "$RSYNC -avv --backup --backup-dir=\"$bakdir\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
-diff -r
u
"$chkdir" "$bakdir"
+diff -r
$diffopt
"$chkdir" "$bakdir"
echo "Extending the file again" >> "$name1"
echo "Extending the other file again" >> "$name2"
checkit "$RSYNC -avv --inplace --backup --backup-dir=\"$bakdir\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
echo "Extending the file again" >> "$name1"
echo "Extending the other file again" >> "$name2"
checkit "$RSYNC -avv --inplace --backup --backup-dir=\"$bakdir\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
-diff -r
u
"$chkdir" "$bakdir"
+diff -r
$diffopt
"$chkdir" "$bakdir"
# The script would have aborted on error, so getting here means we've won.
exit 0
# The script would have aborted on error, so getting here means we've won.
exit 0