Commit | Line | Data |
---|---|---|
a60267ab | 1 | --- orig/options.c 2004-09-23 17:42:07 |
13bed3dd | 2 | +++ options.c 2004-07-03 20:17:33 |
7628f156 | 3 | @@ -48,6 +48,7 @@ int preserve_devices = 0; |
6de33581 WD |
4 | int preserve_uid = 0; |
5 | int preserve_gid = 0; | |
6 | int preserve_times = 0; | |
7 | +int preserve_dir_times = 0; | |
8 | int update_only = 0; | |
9 | int cvs_exclude = 0; | |
10 | int dry_run = 0; | |
42c64c11 | 11 | @@ -252,7 +253,8 @@ void usage(enum logcode F) |
6de33581 WD |
12 | rprintf(F," -o, --owner preserve owner (root only)\n"); |
13 | rprintf(F," -g, --group preserve group\n"); | |
14 | rprintf(F," -D, --devices preserve devices (root only)\n"); | |
15 | - rprintf(F," -t, --times preserve times\n"); | |
16 | + rprintf(F," -t, --times preserve times on non-directories\n"); | |
17 | + rprintf(F," -d, --dir-times preserve times on directories\n"); | |
18 | rprintf(F," -S, --sparse handle sparse files efficiently\n"); | |
19 | rprintf(F," -n, --dry-run show what would have been transferred\n"); | |
20 | rprintf(F," -W, --whole-file copy whole files, no incremental checks\n"); | |
42c64c11 | 21 | @@ -362,6 +364,7 @@ static struct poptOption long_options[] |
6de33581 WD |
22 | {"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 }, |
23 | {"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 }, | |
24 | {"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 }, | |
25 | + {"dir-times", 'd', POPT_ARG_NONE, &preserve_dir_times, 0, 0, 0 }, | |
26 | {"checksum", 'c', POPT_ARG_NONE, &always_checksum, 0, 0, 0 }, | |
27 | {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 }, | |
28 | {"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 }, | |
a60267ab | 29 | @@ -950,6 +953,8 @@ void server_options(char **args,int *arg |
6de33581 WD |
30 | argstr[x++] = 'D'; |
31 | if (preserve_times) | |
32 | argstr[x++] = 't'; | |
33 | + if (preserve_dir_times && am_sender) | |
34 | + argstr[x++] = 'd'; | |
35 | if (preserve_perms) | |
36 | argstr[x++] = 'p'; | |
37 | if (recurse) | |
a6587818 | 38 | --- orig/rsync.c 2004-09-07 21:45:30 |
13bed3dd | 39 | +++ rsync.c 2004-07-03 20:17:33 |
7f2baf27 WD |
40 | @@ -25,6 +25,7 @@ |
41 | extern int verbose; | |
42 | extern int dry_run; | |
43 | extern int preserve_times; | |
44 | +extern int preserve_dir_times; | |
45 | extern int am_root; | |
46 | extern int am_sender; | |
47 | extern int am_generator; | |
42c64c11 | 48 | @@ -142,15 +143,16 @@ int set_perms(char *fname,struct file_st |
6de33581 WD |
49 | st = &st2; |
50 | } | |
51 | ||
7b675ff5 WD |
52 | - if (!preserve_times || S_ISLNK(st->st_mode) |
53 | - || (make_backups && !backup_dir && S_ISDIR(st->st_mode))) | |
7f2baf27 | 54 | - flags |= PERMS_SKIP_MTIME; |
6de33581 | 55 | + if (S_ISDIR(st->st_mode)) { |
7b675ff5 | 56 | + if (!preserve_dir_times || (make_backups && !backup_dir)) |
7f2baf27 | 57 | + flags |= PERMS_SKIP_MTIME; |
6de33581 WD |
58 | + } else { |
59 | + if (!preserve_times || S_ISLNK(st->st_mode)) | |
7f2baf27 | 60 | + flags |= PERMS_SKIP_MTIME; |
6de33581 | 61 | + } |
7f2baf27 | 62 | if (!(flags & PERMS_SKIP_MTIME) |
6de33581 WD |
63 | && cmp_modtime(st->st_mtime, file->modtime) != 0) { |
64 | - /* don't complain about not setting times on directories | |
65 | - * because some filesystems can't do it */ | |
66 | - if (set_modtime(fname,file->modtime) != 0 && | |
67 | - !S_ISDIR(st->st_mode)) { | |
68 | + if (set_modtime(fname,file->modtime) != 0) { | |
fe6407b5 WD |
69 | rsyserr(FERROR, errno, "failed to set times on %s", |
70 | full_fname(fname)); | |
6de33581 | 71 | return 0; |
a60267ab | 72 | --- orig/rsync.yo 2004-09-24 16:42:30 |
42c64c11 | 73 | +++ rsync.yo 2004-08-11 17:27:51 |
772c8c2d | 74 | @@ -329,7 +329,8 @@ verb( |
6de33581 WD |
75 | -o, --owner preserve owner (root only) |
76 | -g, --group preserve group | |
77 | -D, --devices preserve devices (root only) | |
78 | - -t, --times preserve times | |
79 | + -t, --times preserve times on non-directories | |
80 | + -d, --dir-times preserve times on directories | |
81 | -S, --sparse handle sparse files efficiently | |
82 | -n, --dry-run show what would have been transferred | |
83 | -W, --whole-file copy whole files, no incremental checks | |
a60267ab | 84 | @@ -602,14 +603,23 @@ dit(bf(-D, --devices)) This option cause |
6de33581 WD |
85 | block device information to the remote system to recreate these |
86 | devices. This option is only available to the super-user. | |
87 | ||
88 | -dit(bf(-t, --times)) This tells rsync to transfer modification times along | |
89 | -with the files and update them on the remote system. Note that if this | |
90 | +dit(bf(-t, --times)) This tells rsync to preserve modification times of | |
91 | +non-directories transferred to the remote system. Note that if this | |
92 | option is not used, the optimization that excludes files that have not been | |
93 | modified cannot be effective; in other words, a missing -t or -a will | |
42c64c11 WD |
94 | cause the next transfer to behave as if it used -I, causing all files to be |
95 | updated (though the rsync algorithm will make the update fairly efficient | |
96 | if the files haven't actually changed, you're much better off using -t). | |
7b675ff5 | 97 | |
6de33581 WD |
98 | +dit(bf(-d, --dir-times)) This tells rsync to preserve the modification |
99 | +times of directories transferred to the remote system. On a modern | |
100 | +rsync, these are left unpreserved by default to avoid causing problems | |
101 | +for NFS. | |
102 | + | |
103 | +Note: when sending files to an older rsync, the --times option will | |
42c64c11 WD |
104 | +imply --dir-times (if the -d option causes an error on the receiving |
105 | +system, omit it and the --times will preserve all file/directory times). | |
7b675ff5 | 106 | + |
6de33581 WD |
107 | dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers, |
108 | instead it will just report the actions it would have taken. | |
7b675ff5 | 109 | |
772c8c2d WD |
110 | --- orig/testsuite/batch-mode.test 2004-07-23 02:13:34 |
111 | +++ testsuite/batch-mode.test 2004-08-13 09:00:07 | |
112 | @@ -16,12 +16,12 @@ hands_setup | |
113 | cd "$tmpdir" | |
114 | ||
115 | # Build chkdir for the daemon tests using a normal rsync and an --exclude. | |
116 | -$RSYNC -av --exclude=foobar.baz "$fromdir/" "$chkdir/" | |
117 | +$RSYNC -adv --exclude=foobar.baz "$fromdir/" "$chkdir/" | |
118 | ||
119 | -runtest "local --write-batch" 'checkit "$RSYNC -av --write-batch=BATCH \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"' | |
120 | +runtest "local --write-batch" 'checkit "$RSYNC -adv --write-batch=BATCH \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"' | |
121 | ||
122 | rm -rf "$todir" | |
123 | -runtest "--read-batch" 'checkit "$RSYNC -av --read-batch=BATCH \"$todir\"" "$fromdir" "$todir"' | |
124 | +runtest "--read-batch" 'checkit "$RSYNC -adv --read-batch=BATCH \"$todir\"" "$fromdir" "$todir"' | |
125 | ||
126 | build_rsyncd_conf | |
127 | ||
128 | @@ -29,17 +29,17 @@ RSYNC_CONNECT_PROG="$RSYNC --config=$con | |
129 | export RSYNC_CONNECT_PROG | |
130 | ||
131 | rm -rf "$todir" | |
132 | -runtest "daemon sender --write-batch" 'checkit "$RSYNC -av --write-batch=BATCH rsync://localhost/test-from/ \"$todir\"" "$chkdir" "$todir"' | |
133 | +runtest "daemon sender --write-batch" 'checkit "$RSYNC -adv --write-batch=BATCH rsync://localhost/test-from/ \"$todir\"" "$chkdir" "$todir"' | |
134 | ||
135 | rm -rf "$todir" | |
136 | -runtest "--read-batch from daemon" 'checkit "$RSYNC -av --read-batch=BATCH \"$todir\"" "$chkdir" "$todir"' | |
137 | +runtest "--read-batch from daemon" 'checkit "$RSYNC -adv --read-batch=BATCH \"$todir\"" "$chkdir" "$todir"' | |
138 | ||
139 | rm -rf "$todir" | |
140 | runtest "BATCH.sh use of --read-batch" 'checkit "./BATCH.sh" "$chkdir" "$todir"' | |
141 | ||
142 | rm -rf "$todir" | |
143 | mkdir "$todir" || test_fail "failed to restore empty destination directory" | |
144 | -runtest "daemon recv --write-batch" 'checkit "$RSYNC -av --write-batch=BATCH \"$fromdir/\" rsync://localhost/test-to" "$chkdir" "$todir"' | |
145 | +runtest "daemon recv --write-batch" 'checkit "$RSYNC -adv --write-batch=BATCH \"$fromdir/\" rsync://localhost/test-to" "$chkdir" "$todir"' | |
146 | ||
147 | # The script would have aborted on error, so getting here means we pass. | |
148 | exit 0 | |
13bed3dd WD |
149 | --- orig/testsuite/chgrp.test 2004-05-21 23:56:27 |
150 | +++ testsuite/chgrp.test 2004-07-03 20:17:33 | |
7d2d2057 | 151 | @@ -26,7 +26,7 @@ do |
6de33581 WD |
152 | done |
153 | sleep 2 | |
154 | ||
f0533c4c WD |
155 | -checkit "$RSYNC -rtgpvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" |
156 | +checkit "$RSYNC -rtdgpvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" | |
6de33581 | 157 | |
772c8c2d WD |
158 | # The script would have aborted on error, so getting here means we've won. |
159 | exit 0 | |
160 | --- orig/testsuite/chmod-temp-dir.test 2004-08-13 07:18:59 | |
161 | +++ testsuite/chmod-temp-dir.test 2004-08-13 08:59:40 | |
162 | @@ -32,10 +32,10 @@ e="$fromdir/dir/subdir/subsubdir/etc-ltr | |
163 | chmod 2670 "$e" || chmod 1670 "$e" || chmod 670 "$e" | |
164 | ||
165 | # First a normal copy. | |
166 | -runtest "normal copy" 'checkit "$RSYNC -avv --temp-dir=\"$tmpdir2\" \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"' | |
167 | +runtest "normal copy" 'checkit "$RSYNC -advv --temp-dir=\"$tmpdir2\" \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"' | |
168 | ||
169 | # Then we update all the files. | |
170 | -runtest "update copy" 'checkit "$RSYNC -avvI --no-whole-file --temp-dir=\"$tmpdir2\" \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"' | |
171 | +runtest "update copy" 'checkit "$RSYNC -advvI --no-whole-file --temp-dir=\"$tmpdir2\" \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"' | |
172 | ||
173 | # The script would have aborted on error, so getting here means we've won. | |
174 | exit 0 | |
175 | --- orig/testsuite/chmod.test 2004-08-13 07:18:59 | |
176 | +++ testsuite/chmod.test 2004-08-13 08:59:49 | |
177 | @@ -23,10 +23,10 @@ e="$fromdir/dir/subdir/subsubdir/etc-ltr | |
178 | chmod 2670 "$e" || chmod 1670 "$e" || chmod 670 "$e" | |
179 | ||
180 | # First a normal copy. | |
181 | -runtest "normal copy" 'checkit "$RSYNC -avv \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"' | |
182 | +runtest "normal copy" 'checkit "$RSYNC -advv \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"' | |
183 | ||
184 | # Then we update all the files. | |
185 | -runtest "update copy" 'checkit "$RSYNC -avvI --no-whole-file \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"' | |
186 | +runtest "update copy" 'checkit "$RSYNC -advvI --no-whole-file \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"' | |
187 | ||
6de33581 WD |
188 | # The script would have aborted on error, so getting here means we've won. |
189 | exit 0 | |
13bed3dd WD |
190 | --- orig/testsuite/chown.test 2004-05-18 09:14:24 |
191 | +++ testsuite/chown.test 2004-07-03 20:17:33 | |
7d2d2057 | 192 | @@ -28,7 +28,7 @@ chown 5001 "$name2" || test_skipped "Can |
6de33581 WD |
193 | chgrp 5002 "$name1" || test_skipped "Can't chgrp (probably need root)" |
194 | chgrp 5003 "$name2" || test_skipped "Can't chgrp (probably need root)" | |
195 | ||
196 | -checkit "$RSYNC -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" | |
197 | +checkit "$RSYNC -adHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" | |
198 | ||
199 | # The script would have aborted on error, so getting here means we've won. | |
200 | exit 0 | |
772c8c2d WD |
201 | --- orig/testsuite/compare-dest.test 2004-07-23 17:16:13 |
202 | +++ testsuite/compare-dest.test 2004-08-13 09:00:35 | |
203 | @@ -18,15 +18,15 @@ altdir="$tmpdir/alt" | |
204 | hands_setup | |
205 | ||
206 | # Setup the alt and chk dirs | |
207 | -$RSYNC -av --include=text --include='*/' --exclude='*' "$fromdir/" "$altdir/" | |
208 | +$RSYNC -adv --include=text --include='*/' --exclude='*' "$fromdir/" "$altdir/" | |
209 | ||
210 | sleep 1 | |
211 | touch "$fromdir/dir/text" | |
212 | ||
213 | -$RSYNC -av --exclude=/text "$fromdir/" "$chkdir/" | |
214 | +$RSYNC -adv --exclude=/text "$fromdir/" "$chkdir/" | |
215 | ||
216 | # Let's do it! | |
217 | -checkit "$RSYNC -avv --no-whole-file --compare-dest=\"$altdir\" \ | |
218 | +checkit "$RSYNC -advv --no-whole-file --compare-dest=\"$altdir\" \ | |
219 | \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir" | |
220 | ||
221 | # The script would have aborted on error, so getting here means we've won. | |
13bed3dd WD |
222 | --- orig/testsuite/daemon-gzip-download.test 2004-05-18 09:14:24 |
223 | +++ testsuite/daemon-gzip-download.test 2004-07-03 20:17:33 | |
7d2d2057 | 224 | @@ -29,9 +29,9 @@ export RSYNC_CONNECT_PROG |
6de33581 | 225 | hands_setup |
7d2d2057 WD |
226 | |
227 | # Build chkdir with a normal rsync and an --exclude. | |
228 | -$RSYNC -av --exclude=foobar.baz "$fromdir/" "$chkdir/" | |
229 | +$RSYNC -adv --exclude=foobar.baz "$fromdir/" "$chkdir/" | |
230 | ||
231 | -checkit "$RSYNC -avvvvz localhost::test-from/ \"$todir/\"" "$chkdir" "$todir" | |
232 | +checkit "$RSYNC -advvvvz localhost::test-from/ \"$todir/\"" "$chkdir" "$todir" | |
6de33581 WD |
233 | |
234 | # The script would have aborted on error, so getting here means we've won. | |
235 | exit 0 | |
13bed3dd WD |
236 | --- orig/testsuite/daemon-gzip-upload.test 2004-05-18 09:14:24 |
237 | +++ testsuite/daemon-gzip-upload.test 2004-07-03 20:17:33 | |
7d2d2057 | 238 | @@ -23,9 +23,9 @@ export RSYNC_CONNECT_PROG |
6de33581 | 239 | hands_setup |
7d2d2057 WD |
240 | |
241 | # Build chkdir with a normal rsync and an --exclude. | |
242 | -$RSYNC -av --exclude=foobar.baz "$fromdir/" "$chkdir/" | |
243 | +$RSYNC -adv --exclude=foobar.baz "$fromdir/" "$chkdir/" | |
244 | ||
245 | -checkit "$RSYNC -avvvvz \"$fromdir/\" localhost::test-to/" "$chkdir" "$todir" | |
246 | +checkit "$RSYNC -advvvvz \"$fromdir/\" localhost::test-to/" "$chkdir" "$todir" | |
6de33581 WD |
247 | |
248 | # The script would have aborted on error, so getting here means we've won. | |
249 | exit 0 | |
a60267ab | 250 | --- orig/testsuite/devices.test 2004-09-23 17:42:07 |
13bed3dd | 251 | +++ testsuite/devices.test 2004-07-03 20:17:33 |
a60267ab | 252 | @@ -30,7 +30,7 @@ mknod "$fromdir/block2" b 42 73 || test_ |
6de33581 | 253 | mknod "$fromdir/block3" b 105 73 || test_skipped "Can't create block device node unless root" |
a60267ab | 254 | mkfifo "$fromdir/fifo" || test_skipped "Can't run mkfifo" |
6de33581 WD |
255 | |
256 | -checkit "$RSYNC -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" | |
257 | +checkit "$RSYNC -adHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" | |
258 | ||
259 | # The script would have aborted on error, so getting here means we've won. | |
260 | exit 0 | |
13bed3dd WD |
261 | --- orig/testsuite/duplicates.test 2004-05-18 09:14:24 |
262 | +++ testsuite/duplicates.test 2004-07-03 20:17:33 | |
7d2d2057 | 263 | @@ -33,7 +33,7 @@ ln -s "$name1" "$name2" || fail "can't c |
6de33581 WD |
264 | |
265 | outfile="$scratchdir/rsync.out" | |
266 | ||
267 | -checkit "$RSYNC -avv \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" \ | |
268 | +checkit "$RSYNC -advv \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" \ | |
269 | | tee "$outfile" | |
270 | ||
271 | # Make sure each file was only copied once... | |
13bed3dd WD |
272 | --- orig/testsuite/exclude.test 2004-05-29 21:25:45 |
273 | +++ testsuite/exclude.test 2004-07-03 20:17:33 | |
78114162 | 274 | @@ -66,7 +66,7 @@ EOF |
6de33581 WD |
275 | |
276 | # Create the chk dir with what we expect to be excluded | |
277 | ||
278 | -checkit "$RSYNC -avv \"$fromdir/\" \"$chkdir/\"" "$fromdir" "$chkdir" | |
279 | +checkit "$RSYNC -advv \"$fromdir/\" \"$chkdir/\"" "$fromdir" "$chkdir" | |
280 | ||
281 | sleep 1 # Ensures that the rm commands will tweak the directory times. | |
282 | ||
78114162 | 283 | @@ -78,11 +78,11 @@ rm "$chkdir"/mid/for/foo/extra |
6de33581 WD |
284 | |
285 | # Un-tweak the directory times in our first (weak) exclude test (though | |
286 | # it's a good test of the --existing option). | |
287 | -$RSYNC -av --existing --include='*/' --exclude='*' "$fromdir/" "$chkdir/" | |
288 | +$RSYNC -adv --existing --include='*/' --exclude='*' "$fromdir/" "$chkdir/" | |
289 | ||
290 | # Now, test if rsync excludes the same files. | |
291 | ||
78114162 WD |
292 | -checkit "$RSYNC -avv --exclude-from=\"$excl\" \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir" |
293 | +checkit "$RSYNC -advv --exclude-from=\"$excl\" \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir" | |
6de33581 WD |
294 | |
295 | # Modify the chk dir by removing cvs-ignored files and then tweaking the dir times. | |
296 | ||
78114162 | 297 | @@ -92,12 +92,12 @@ rm "$chkdir"/bar/down/to/foo/*.junk |
6de33581 WD |
298 | rm "$chkdir"/bar/down/to/home-cvs-exclude |
299 | rm "$chkdir"/mid/one-in-one-out | |
300 | ||
301 | -$RSYNC -av --existing --include='*/' --exclude='*' "$fromdir/" "$chkdir/" | |
302 | +$RSYNC -adv --existing --include='*/' --exclude='*' "$fromdir/" "$chkdir/" | |
303 | ||
304 | # Now, test if rsync excludes the same files, this time with --cvs-exclude | |
305 | # and --delete-excluded. | |
306 | ||
78114162 WD |
307 | -checkit "$RSYNC -avvC --exclude-from=\"$excl\" \ |
308 | +checkit "$RSYNC -advvC --exclude-from=\"$excl\" \ | |
309 | --delete-excluded \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir" | |
6de33581 WD |
310 | |
311 | # The script would have aborted on error, so getting here means we've won. | |
13bed3dd WD |
312 | --- orig/testsuite/hands.test 2004-05-18 09:14:24 |
313 | +++ testsuite/hands.test 2004-07-03 20:17:33 | |
6de33581 WD |
314 | @@ -11,19 +11,19 @@ hands_setup |
315 | ||
316 | # Main script starts here | |
317 | ||
7d2d2057 WD |
318 | -runtest "basic operation" 'checkit "$RSYNC -av \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' |
319 | +runtest "basic operation" 'checkit "$RSYNC -adv \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' | |
6de33581 | 320 | |
7d2d2057 WD |
321 | ln "$fromdir/filelist" "$fromdir/dir" |
322 | -runtest "hard links" 'checkit "$RSYNC -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' | |
323 | +runtest "hard links" 'checkit "$RSYNC -advH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' | |
6de33581 | 324 | |
7d2d2057 WD |
325 | rm "$todir/text" |
326 | -runtest "one file" 'checkit "$RSYNC -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' | |
327 | +runtest "one file" 'checkit "$RSYNC -advH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' | |
6de33581 | 328 | |
7d2d2057 WD |
329 | echo "extra line" >> "$todir/text" |
330 | -runtest "extra data" 'checkit "$RSYNC -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' | |
331 | +runtest "extra data" 'checkit "$RSYNC -advH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' | |
6de33581 | 332 | |
7d2d2057 WD |
333 | cp "$fromdir/text" "$todir/ThisShouldGo" |
334 | -runtest " --delete" 'checkit "$RSYNC --delete -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' | |
335 | +runtest " --delete" 'checkit "$RSYNC --delete -advH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' | |
6de33581 WD |
336 | |
337 | # The script would have aborted on error, so getting here means we've won. | |
338 | exit 0 | |
13bed3dd WD |
339 | --- orig/testsuite/hardlinks.test 2004-05-18 09:14:24 |
340 | +++ testsuite/hardlinks.test 2004-07-03 20:17:33 | |
6de33581 WD |
341 | @@ -31,7 +31,7 @@ ln "$name1" "$name2" || fail "Can't crea |
342 | ln "$name2" "$name3" || fail "Can't create hardlink" | |
343 | cp "$name2" "$name4" || fail "Can't copy file" | |
344 | ||
345 | -checkit "$RSYNC -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" | |
346 | +checkit "$RSYNC -adHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" | |
347 | ||
348 | # The script would have aborted on error, so getting here means we've won. | |
349 | exit 0 | |
13bed3dd WD |
350 | --- orig/testsuite/longdir.test 2004-05-18 09:50:26 |
351 | +++ testsuite/longdir.test 2004-07-03 20:17:33 | |
7d2d2057 WD |
352 | @@ -18,7 +18,7 @@ makepath "$longdir" || test_skipped "una |
353 | touch "$longdir/1" || test_skipped "unable to create files in long directory" | |
354 | date > "$longdir/1" | |
355 | ls -la / > "$longdir/2" | |
356 | -checkit "$RSYNC --delete -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir" | |
357 | +checkit "$RSYNC --delete -advH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir" | |
6de33581 WD |
358 | |
359 | # The script would have aborted on error, so getting here means we've won. | |
360 | exit 0 | |
13bed3dd WD |
361 | --- orig/testsuite/merge.test 2004-05-18 09:14:24 |
362 | +++ testsuite/merge.test 2004-07-03 20:17:33 | |
7d2d2057 | 363 | @@ -40,9 +40,9 @@ cp -p "$from2dir"/sub1/uno "$from3dir"/s |
6de33581 WD |
364 | cp -p "$from3dir"/sub2/subby "$chkdir"/sub2 |
365 | ||
366 | # Get rid of any directory-time differences | |
367 | -$RSYNC -av --existing --include='*/' --exclude='*' "$from1dir/" "$from2dir/" "$from3dir/" "$chkdir/" | |
368 | +$RSYNC -adv --existing --include='*/' --exclude='*' "$from1dir/" "$from2dir/" "$from3dir/" "$chkdir/" | |
369 | ||
370 | -checkit "$RSYNC -aHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir" | |
371 | +checkit "$RSYNC -adHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir" | |
372 | ||
373 | # The script would have aborted on error, so getting here means we've won. | |
374 | exit 0 | |
13bed3dd WD |
375 | --- orig/testsuite/ssh-basic.test 2004-05-18 09:14:24 |
376 | +++ testsuite/ssh-basic.test 2004-07-03 20:17:33 | |
6de33581 WD |
377 | @@ -28,7 +28,7 @@ fi |
378 | # nothing to do. | |
379 | hands_setup | |
380 | ||
7d2d2057 WD |
381 | -runtest "ssh: basic test" 'checkit "$RSYNC -avH -e ssh --rsync-path=$RSYNC \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"' |
382 | +runtest "ssh: basic test" 'checkit "$RSYNC -advH -e ssh --rsync-path=$RSYNC \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"' | |
6de33581 WD |
383 | |
384 | # Added by Steve Bonds Feb 2 2003 | |
385 | # I assumed that "F1" was intended to hold a single file for testing if | |
7d2d2057 | 386 | @@ -40,4 +40,4 @@ F1=`ls "$todir" | head -5 | tail -1` |
6de33581 | 387 | |
7d2d2057 | 388 | mv "$todir/$F1" "$todir/ThisShouldGo" |
6de33581 | 389 | |
7d2d2057 WD |
390 | -runtest "ssh: renamed file" 'checkit "$RSYNC --delete -avH -e ssh --rsync-path=$RSYNC \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"' |
391 | +runtest "ssh: renamed file" 'checkit "$RSYNC --delete -advH -e ssh --rsync-path=$RSYNC \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"' | |
13bed3dd WD |
392 | --- orig/testsuite/unsafe-links.test 2004-05-18 09:14:24 |
393 | +++ testsuite/unsafe-links.test 2004-07-03 20:17:33 | |
6de33581 WD |
394 | @@ -35,33 +35,33 @@ ln -s ../../unsafe/unsafefile "from/safe |
395 | set -x | |
396 | ||
397 | echo "rsync with relative path and just -a"; | |
398 | -$RSYNC -avv from/safe/ to | |
399 | +$RSYNC -advv from/safe/ to | |
400 | test_symlink to/links/file1 | |
401 | test_symlink to/links/file2 | |
402 | test_symlink to/links/unsafefile | |
403 | ||
404 | echo "rsync with relative path and -a --copy-links" | |
405 | -$RSYNC -avv --copy-links from/safe/ to | |
406 | +$RSYNC -advv --copy-links from/safe/ to | |
407 | test_regular to/links/file1 | |
408 | test_regular to/links/file2 | |
409 | test_regular to/links/unsafefile | |
410 | ||
411 | echo "rsync with relative path and --copy-unsafe-links"; | |
412 | -$RSYNC -avv --copy-unsafe-links from/safe/ to | |
413 | +$RSYNC -advv --copy-unsafe-links from/safe/ to | |
414 | test_symlink to/links/file1 | |
415 | test_symlink to/links/file2 | |
416 | test_regular to/links/unsafefile | |
417 | ||
418 | rm -rf to | |
419 | echo "rsync with relative2 path"; | |
420 | -(cd from; $RSYNC -avv --copy-unsafe-links safe/ ../to) | |
421 | +(cd from; $RSYNC -advv --copy-unsafe-links safe/ ../to) | |
422 | test_symlink to/links/file1 | |
423 | test_symlink to/links/file2 | |
424 | test_regular to/links/unsafefile | |
425 | ||
426 | rm -rf to | |
427 | echo "rsync with absolute path"; | |
428 | -$RSYNC -avv --copy-unsafe-links `pwd`/from/safe/ to | |
429 | +$RSYNC -advv --copy-unsafe-links `pwd`/from/safe/ to | |
430 | test_symlink to/links/file1 | |
431 | test_symlink to/links/file2 | |
432 | test_regular to/links/unsafefile |