---- options.c 22 May 2004 06:09:22 -0000 1.151
-+++ options.c 22 May 2004 19:31:28 -0000
-@@ -46,6 +46,7 @@ int preserve_devices = 0;
+--- 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 preserve_gid = 0;
int preserve_times = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -240,7 +241,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");
-@@ -347,6 +349,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 },
-@@ -824,6 +827,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)
---- rsync.c 21 May 2004 08:43:03 -0000 1.140
-+++ rsync.c 22 May 2004 19:31:28 -0000
+--- 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 dry_run;
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;
---- rsync.yo 21 May 2004 09:44:32 -0000 1.170
-+++ rsync.yo 22 May 2004 19:31:29 -0000
-@@ -298,7 +298,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
-@@ -539,14 +540,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.
---- testsuite/chgrp.test 21 May 2004 10:06:09 -0000 1.12
-+++ testsuite/chgrp.test 22 May 2004 19:31:29 -0000
+--- 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
done
sleep 2
# The script would have aborted on error, so getting here means we've won.
exit 0
---- testsuite/chown.test 18 May 2004 00:41:35 -0000 1.5
-+++ testsuite/chown.test 22 May 2004 19:31:29 -0000
+--- 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
++++ testsuite/chown.test 2004-07-03 20:17:33
@@ -28,7 +28,7 @@ chown 5001 "$name2" || test_skipped "Can
chgrp 5002 "$name1" || test_skipped "Can't chgrp (probably need root)"
chgrp 5003 "$name2" || test_skipped "Can't chgrp (probably need root)"
# The script would have aborted on error, so getting here means we've won.
exit 0
---- testsuite/daemon-gzip-download.test 18 May 2004 00:41:51 -0000 1.7
-+++ testsuite/daemon-gzip-download.test 22 May 2004 19:31:29 -0000
+--- 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
hands_setup
# The script would have aborted on error, so getting here means we've won.
exit 0
---- testsuite/daemon-gzip-upload.test 18 May 2004 00:41:51 -0000 1.7
-+++ testsuite/daemon-gzip-upload.test 22 May 2004 19:31:29 -0000
+--- orig/testsuite/daemon-gzip-upload.test 2004-05-18 09:14:24
++++ testsuite/daemon-gzip-upload.test 2004-07-03 20:17:33
@@ -23,9 +23,9 @@ export RSYNC_CONNECT_PROG
hands_setup
# The script would have aborted on error, so getting here means we've won.
exit 0
---- testsuite/devices.test 18 May 2004 00:41:35 -0000 1.8
-+++ testsuite/devices.test 22 May 2004 19:31:29 -0000
+--- orig/testsuite/devices.test 2004-05-18 09:14:24
++++ testsuite/devices.test 2004-07-03 20:17:33
@@ -29,7 +29,7 @@ mknod "$fromdir/block" b 42 69 || test_s
mknod "$fromdir/block2" b 42 73 || test_skipped "Can't create block device node unless root"
mknod "$fromdir/block3" b 105 73 || test_skipped "Can't create block device node unless root"
# The script would have aborted on error, so getting here means we've won.
exit 0
---- testsuite/duplicates.test 18 May 2004 00:41:35 -0000 1.10
-+++ testsuite/duplicates.test 22 May 2004 19:31:29 -0000
+--- orig/testsuite/duplicates.test 2004-05-18 09:14:24
++++ testsuite/duplicates.test 2004-07-03 20:17:33
@@ -33,7 +33,7 @@ ln -s "$name1" "$name2" || fail "can't c
outfile="$scratchdir/rsync.out"
| tee "$outfile"
# Make sure each file was only copied once...
---- testsuite/exclude.test 22 May 2004 19:29:53 -0000 1.7
-+++ testsuite/exclude.test 22 May 2004 19:31:29 -0000
-@@ -63,7 +63,7 @@ EOF
+--- orig/testsuite/exclude.test 2004-05-29 21:25:45
++++ testsuite/exclude.test 2004-07-03 20:17:33
+@@ -66,7 +66,7 @@ EOF
# Create the chk dir with what we expect to be excluded
sleep 1 # Ensures that the rm commands will tweak the directory times.
-@@ -75,11 +75,11 @@ rm "$chkdir"/mid/for/foo/extra
+@@ -78,11 +78,11 @@ rm "$chkdir"/mid/for/foo/extra
# Un-tweak the directory times in our first (weak) exclude test (though
# it's a good test of the --existing option).
# Now, test if rsync excludes the same files.
--checkit "$RSYNC -avv --exclude-from=$excl \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
-+checkit "$RSYNC -advv --exclude-from=$excl \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
+-checkit "$RSYNC -avv --exclude-from=\"$excl\" \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
++checkit "$RSYNC -advv --exclude-from=\"$excl\" \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
# Modify the chk dir by removing cvs-ignored files and then tweaking the dir times.
-@@ -89,12 +89,12 @@ rm "$chkdir"/bar/down/to/foo/*.junk
+@@ -92,12 +92,12 @@ rm "$chkdir"/bar/down/to/foo/*.junk
rm "$chkdir"/bar/down/to/home-cvs-exclude
rm "$chkdir"/mid/one-in-one-out
# Now, test if rsync excludes the same files, this time with --cvs-exclude
# and --delete-excluded.
--checkit "$RSYNC -avvC --delete-excluded --exclude-from=$excl \
-+checkit "$RSYNC -advvC --delete-excluded --exclude-from=$excl \
- \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
+-checkit "$RSYNC -avvC --exclude-from=\"$excl\" \
++checkit "$RSYNC -advvC --exclude-from=\"$excl\" \
+ --delete-excluded \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
# The script would have aborted on error, so getting here means we've won.
---- testsuite/hands.test 18 May 2004 00:41:46 -0000 1.13
-+++ testsuite/hands.test 22 May 2004 19:31:29 -0000
+--- orig/testsuite/hands.test 2004-05-18 09:14:24
++++ testsuite/hands.test 2004-07-03 20:17:33
@@ -11,19 +11,19 @@ hands_setup
# Main script starts here
# The script would have aborted on error, so getting here means we've won.
exit 0
---- testsuite/hardlinks.test 18 May 2004 00:41:40 -0000 1.5
-+++ testsuite/hardlinks.test 22 May 2004 19:31:29 -0000
+--- orig/testsuite/hardlinks.test 2004-05-18 09:14:24
++++ testsuite/hardlinks.test 2004-07-03 20:17:33
@@ -31,7 +31,7 @@ ln "$name1" "$name2" || fail "Can't crea
ln "$name2" "$name3" || fail "Can't create hardlink"
cp "$name2" "$name4" || fail "Can't copy file"
# The script would have aborted on error, so getting here means we've won.
exit 0
---- testsuite/longdir.test 18 May 2004 09:47:42 -0000 1.11
-+++ testsuite/longdir.test 22 May 2004 19:31:29 -0000
+--- orig/testsuite/longdir.test 2004-05-18 09:50:26
++++ testsuite/longdir.test 2004-07-03 20:17:33
@@ -18,7 +18,7 @@ makepath "$longdir" || test_skipped "una
touch "$longdir/1" || test_skipped "unable to create files in long directory"
date > "$longdir/1"
# The script would have aborted on error, so getting here means we've won.
exit 0
---- testsuite/merge.test 18 May 2004 00:41:38 -0000 1.6
-+++ testsuite/merge.test 22 May 2004 19:31:29 -0000
+--- 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
# The script would have aborted on error, so getting here means we've won.
exit 0
---- testsuite/ssh-basic.test 18 May 2004 00:41:46 -0000 1.7
-+++ testsuite/ssh-basic.test 22 May 2004 19:31:29 -0000
+--- orig/testsuite/ssh-basic.test 2004-05-18 09:14:24
++++ testsuite/ssh-basic.test 2004-07-03 20:17:33
@@ -28,7 +28,7 @@ fi
# nothing to do.
hands_setup
-runtest "ssh: renamed file" 'checkit "$RSYNC --delete -avH -e ssh --rsync-path=$RSYNC \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"'
+runtest "ssh: renamed file" 'checkit "$RSYNC --delete -advH -e ssh --rsync-path=$RSYNC \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"'
---- testsuite/unsafe-links.test 18 May 2004 00:41:43 -0000 1.7
-+++ testsuite/unsafe-links.test 22 May 2004 19:31:29 -0000
+--- orig/testsuite/unsafe-links.test 2004-05-18 09:14:24
++++ testsuite/unsafe-links.test 2004-07-03 20:17:33
@@ -35,33 +35,33 @@ ln -s ../../unsafe/unsafefile "from/safe
set -x
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff