---- orig/options.c 2004-10-14 17:11:40
+--- orig/options.c 2005-01-01 21:11:00
+++ options.c 2004-07-03 20:17:33
@@ -48,6 +48,7 @@ int preserve_devices = 0;
int preserve_uid = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -252,7 +253,8 @@ void usage(enum logcode F)
+@@ -259,7 +260,8 @@ void usage(enum logcode F)
rprintf(F," -o, --owner preserve owner (root only)\n");
rprintf(F," -g, --group preserve group\n");
rprintf(F," -D, --devices preserve devices (root only)\n");
rprintf(F," -S, --sparse handle sparse files efficiently\n");
rprintf(F," -n, --dry-run show what would have been transferred\n");
rprintf(F," -W, --whole-file copy whole files, no incremental checks\n");
-@@ -355,6 +357,7 @@ static struct poptOption long_options[]
+@@ -366,6 +368,7 @@ static struct poptOption long_options[]
{"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 },
{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
{"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
{"checksum", 'c', POPT_ARG_NONE, &always_checksum, 0, 0, 0 },
{"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
{"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 },
-@@ -1007,6 +1010,8 @@ void server_options(char **args,int *arg
+@@ -1081,6 +1084,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
rsyserr(FERROR, errno, "failed to set times on %s",
full_fname(fname));
return 0;
---- orig/rsync.yo 2004-10-06 00:12:16
+--- orig/rsync.yo 2005-01-01 21:11:01
+++ rsync.yo 2004-08-11 17:27:51
@@ -329,7 +329,8 @@ verb(
-o, --owner preserve owner (root only)
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
-W, --whole-file copy whole files, no incremental checks
-@@ -602,14 +603,23 @@ dit(bf(-D, --devices)) This option cause
+@@ -620,14 +621,23 @@ dit(bf(-D, --devices)) This option cause
block device information to the remote system to recreate these
devices. This option is only available to the super-user.
# The script would have aborted on error, so getting here means we've won.
exit 0
---- orig/testsuite/compare-dest.test 2004-07-23 17:16:13
-+++ testsuite/compare-dest.test 2004-08-13 09:00:35
-@@ -18,15 +18,15 @@ altdir="$tmpdir/alt"
+--- orig/testsuite/compare-dest.test 2004-11-27 18:01:54
++++ testsuite/compare-dest.test 2004-11-27 18:06:27
+@@ -19,19 +19,19 @@ alt2dir="$tmpdir/alt2"
hands_setup
# Setup the alt and chk dirs
--$RSYNC -av --include=text --include='*/' --exclude='*' "$fromdir/" "$altdir/"
-+$RSYNC -adv --include=text --include='*/' --exclude='*' "$fromdir/" "$altdir/"
+-$RSYNC -av --include=text --include='*/' --exclude='*' "$fromdir/" "$alt1dir/"
+-$RSYNC -av --include=etc-ltr-list --include='*/' --exclude='*' "$fromdir/" "$alt2dir/"
++$RSYNC -adv --include=text --include='*/' --exclude='*' "$fromdir/" "$alt1dir/"
++$RSYNC -adv --include=etc-ltr-list --include='*/' --exclude='*' "$fromdir/" "$alt2dir/"
sleep 1
touch "$fromdir/dir/text"
--$RSYNC -av --exclude=/text "$fromdir/" "$chkdir/"
-+$RSYNC -adv --exclude=/text "$fromdir/" "$chkdir/"
+-$RSYNC -av --exclude=/text --exclude=etc-ltr-list "$fromdir/" "$chkdir/"
++$RSYNC -adv --exclude=/text --exclude=etc-ltr-list "$fromdir/" "$chkdir/"
# Let's do it!
--checkit "$RSYNC -avv --no-whole-file --compare-dest=\"$altdir\" \
-+checkit "$RSYNC -advv --no-whole-file --compare-dest=\"$altdir\" \
+-checkit "$RSYNC -avv --no-whole-file \
++checkit "$RSYNC -advv --no-whole-file \
+ --compare-dest=\"$alt1dir\" --compare-dest=\"$alt2dir\" \
\"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
+-checkit "$RSYNC -avv --no-whole-file \
++checkit "$RSYNC -advv --no-whole-file \
+ --copy-dest=\"$alt1dir\" --copy-dest=\"$alt2dir\" \
+ \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
- # The script would have aborted on error, so getting here means we've won.
--- orig/testsuite/daemon-gzip-download.test 2004-05-18 09:14:24
+++ testsuite/daemon-gzip-download.test 2004-07-03 20:17:33
@@ -29,9 +29,9 @@ export RSYNC_CONNECT_PROG
# The script would have aborted on error, so getting here means we've won.
exit 0
---- orig/testsuite/merge.test 2004-05-18 09:14:24
-+++ testsuite/merge.test 2004-07-03 20:17:33
-@@ -40,9 +40,9 @@ cp -p "$from2dir"/sub1/uno "$from3dir"/s
- cp -p "$from3dir"/sub2/subby "$chkdir"/sub2
-
- # Get rid of any directory-time differences
--$RSYNC -av --existing --include='*/' --exclude='*' "$from1dir/" "$from2dir/" "$from3dir/" "$chkdir/"
-+$RSYNC -adv --existing --include='*/' --exclude='*' "$from1dir/" "$from2dir/" "$from3dir/" "$chkdir/"
+--- orig/testsuite/merge.test 2005-01-01 21:11:13
++++ testsuite/merge.test 2005-01-01 21:14:14
+@@ -44,7 +44,7 @@ touch "$from1dir" "$from2dir" "$from3dir
+ "$from2dir"/sub1 "$from3dir"/sub1 "$from3dir"/sub2 \
+ "$chkdir" "$chkdir"/sub1 "$chkdir"/sub2
-checkit "$RSYNC -aHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir"
+checkit "$RSYNC -adHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir"