---- orig/options.c 2004-06-20 19:30:00
+--- orig/options.c 2004-09-20 05:10:48
+++ 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;
-@@ -244,7 +245,8 @@ void usage(enum logcode F)
+@@ -252,7 +253,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");
-@@ -352,6 +354,7 @@ static struct poptOption long_options[]
+@@ -362,6 +364,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 },
-@@ -841,6 +844,8 @@ void server_options(char **args,int *arg
+@@ -946,6 +949,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
if (preserve_perms)
argstr[x++] = 'p';
if (recurse)
---- orig/rsync.c 2004-07-02 18:06:32
+--- orig/rsync.c 2004-09-07 21:45:30
+++ rsync.c 2004-07-03 20:17:33
@@ -25,6 +25,7 @@
extern int verbose;
extern int am_root;
extern int am_sender;
extern int am_generator;
-@@ -140,15 +141,16 @@ int set_perms(char *fname,struct file_st
+@@ -142,15 +143,16 @@ int set_perms(char *fname,struct file_st
st = &st2;
}
rsyserr(FERROR, errno, "failed to set times on %s",
full_fname(fname));
return 0;
---- orig/rsync.yo 2004-06-17 06:32:00
-+++ rsync.yo 2004-07-03 20:17:33
-@@ -299,7 +299,8 @@ verb(
+--- orig/rsync.yo 2004-09-20 05:10:48
++++ rsync.yo 2004-08-11 17:27:51
+@@ -329,7 +329,8 @@ verb(
-o, --owner preserve owner (root only)
-g, --group preserve group
-D, --devices preserve devices (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
-@@ -544,14 +545,23 @@ dit(bf(-D, --devices)) This option cause
+@@ -595,14 +596,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.
+non-directories transferred to the remote system. Note that if this
option is not used, the optimization that excludes files that have not been
modified cannot be effective; in other words, a missing -t or -a will
- cause the next transfer to behave as if it used -I, and all files will have
- their checksums compared and show up in log messages even if they haven't
- changed.
+ cause the next transfer to behave as if it used -I, causing all files to be
+ updated (though the rsync algorithm will make the update fairly efficient
+ if the files haven't actually changed, you're much better off using -t).
+dit(bf(-d, --dir-times)) This tells rsync to preserve the modification
+times of directories transferred to the remote system. On a modern
+for NFS.
+
+Note: when sending files to an older rsync, the --times option will
-+imply --dir-times (if the option causes an error on the receiving
-+system, omit it and use --times to preserve all file/directory times).
++imply --dir-times (if the -d option causes an error on the receiving
++system, omit it and the --times will preserve all file/directory times).
+
dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers,
instead it will just report the actions it would have taken.
+--- orig/testsuite/batch-mode.test 2004-07-23 02:13:34
++++ testsuite/batch-mode.test 2004-08-13 09:00:07
+@@ -16,12 +16,12 @@ hands_setup
+ cd "$tmpdir"
+
+ # Build chkdir for the daemon tests using a normal rsync and an --exclude.
+-$RSYNC -av --exclude=foobar.baz "$fromdir/" "$chkdir/"
++$RSYNC -adv --exclude=foobar.baz "$fromdir/" "$chkdir/"
+
+-runtest "local --write-batch" 'checkit "$RSYNC -av --write-batch=BATCH \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"'
++runtest "local --write-batch" 'checkit "$RSYNC -adv --write-batch=BATCH \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"'
+
+ rm -rf "$todir"
+-runtest "--read-batch" 'checkit "$RSYNC -av --read-batch=BATCH \"$todir\"" "$fromdir" "$todir"'
++runtest "--read-batch" 'checkit "$RSYNC -adv --read-batch=BATCH \"$todir\"" "$fromdir" "$todir"'
+
+ build_rsyncd_conf
+
+@@ -29,17 +29,17 @@ RSYNC_CONNECT_PROG="$RSYNC --config=$con
+ export RSYNC_CONNECT_PROG
+
+ rm -rf "$todir"
+-runtest "daemon sender --write-batch" 'checkit "$RSYNC -av --write-batch=BATCH rsync://localhost/test-from/ \"$todir\"" "$chkdir" "$todir"'
++runtest "daemon sender --write-batch" 'checkit "$RSYNC -adv --write-batch=BATCH rsync://localhost/test-from/ \"$todir\"" "$chkdir" "$todir"'
+
+ rm -rf "$todir"
+-runtest "--read-batch from daemon" 'checkit "$RSYNC -av --read-batch=BATCH \"$todir\"" "$chkdir" "$todir"'
++runtest "--read-batch from daemon" 'checkit "$RSYNC -adv --read-batch=BATCH \"$todir\"" "$chkdir" "$todir"'
+
+ rm -rf "$todir"
+ runtest "BATCH.sh use of --read-batch" 'checkit "./BATCH.sh" "$chkdir" "$todir"'
+
+ rm -rf "$todir"
+ mkdir "$todir" || test_fail "failed to restore empty destination directory"
+-runtest "daemon recv --write-batch" 'checkit "$RSYNC -av --write-batch=BATCH \"$fromdir/\" rsync://localhost/test-to" "$chkdir" "$todir"'
++runtest "daemon recv --write-batch" 'checkit "$RSYNC -adv --write-batch=BATCH \"$fromdir/\" rsync://localhost/test-to" "$chkdir" "$todir"'
+
+ # The script would have aborted on error, so getting here means we pass.
+ exit 0
--- orig/testsuite/chgrp.test 2004-05-21 23:56:27
+++ testsuite/chgrp.test 2004-07-03 20:17:33
@@ -26,7 +26,7 @@ do
-checkit "$RSYNC -rtgpvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
+checkit "$RSYNC -rtdgpvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
+ # The script would have aborted on error, so getting here means we've won.
+ exit 0
+--- orig/testsuite/chmod-temp-dir.test 2004-08-13 07:18:59
++++ testsuite/chmod-temp-dir.test 2004-08-13 08:59:40
+@@ -32,10 +32,10 @@ e="$fromdir/dir/subdir/subsubdir/etc-ltr
+ chmod 2670 "$e" || chmod 1670 "$e" || chmod 670 "$e"
+
+ # First a normal copy.
+-runtest "normal copy" 'checkit "$RSYNC -avv --temp-dir=\"$tmpdir2\" \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"'
++runtest "normal copy" 'checkit "$RSYNC -advv --temp-dir=\"$tmpdir2\" \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"'
+
+ # Then we update all the files.
+-runtest "update copy" 'checkit "$RSYNC -avvI --no-whole-file --temp-dir=\"$tmpdir2\" \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"'
++runtest "update copy" 'checkit "$RSYNC -advvI --no-whole-file --temp-dir=\"$tmpdir2\" \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"'
+
+ # The script would have aborted on error, so getting here means we've won.
+ exit 0
+--- orig/testsuite/chmod.test 2004-08-13 07:18:59
++++ testsuite/chmod.test 2004-08-13 08:59:49
+@@ -23,10 +23,10 @@ e="$fromdir/dir/subdir/subsubdir/etc-ltr
+ chmod 2670 "$e" || chmod 1670 "$e" || chmod 670 "$e"
+
+ # First a normal copy.
+-runtest "normal copy" 'checkit "$RSYNC -avv \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"'
++runtest "normal copy" 'checkit "$RSYNC -advv \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"'
+
+ # Then we update all the files.
+-runtest "update copy" 'checkit "$RSYNC -avvI --no-whole-file \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"'
++runtest "update copy" 'checkit "$RSYNC -advvI --no-whole-file \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"'
+
# The script would have aborted on error, so getting here means we've won.
exit 0
--- orig/testsuite/chown.test 2004-05-18 09:14:24
# 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"
+ hands_setup
+
+ # Setup the alt and chk dirs
+-$RSYNC -av --include=text --include='*/' --exclude='*' "$fromdir/" "$altdir/"
++$RSYNC -adv --include=text --include='*/' --exclude='*' "$fromdir/" "$altdir/"
+
+ sleep 1
+ touch "$fromdir/dir/text"
+
+-$RSYNC -av --exclude=/text "$fromdir/" "$chkdir/"
++$RSYNC -adv --exclude=/text "$fromdir/" "$chkdir/"
+
+ # Let's do it!
+-checkit "$RSYNC -avv --no-whole-file --compare-dest=\"$altdir\" \
++checkit "$RSYNC -advv --no-whole-file --compare-dest=\"$altdir\" \
+ \"$fromdir/\" \"$todir/\"" "$chkdir" "$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
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff