From 5a9d324446a0bf3e2a8e5206338ef6104c5f5281 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Wed, 31 May 2006 15:24:12 +0000 Subject: [PATCH] Mention -A isn't included in --archive (-a) in option summary. --- acls.diff | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/acls.diff b/acls.diff index 23d76dc..f6fd11b 100644 --- a/acls.diff +++ b/acls.diff @@ -5570,6 +5570,15 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. /* Note that this field may not have type ino_t. It depends * on the complicated interaction between largefile feature +@@ -278,7 +284,7 @@ void usage(enum logcode F) + rprintf(F," -v, --verbose increase verbosity\n"); + rprintf(F," -q, --quiet suppress non-error messages\n"); + rprintf(F," -c, --checksum skip based on checksum, not mod-time & size\n"); +- rprintf(F," -a, --archive archive mode; same as -rlptgoD (no -H)\n"); ++ rprintf(F," -a, --archive archive mode; same as -rlptgoD (no -H, -A)\n"); + rprintf(F," --no-OPTION turn off an implied OPTION (e.g. --no-D)\n"); + rprintf(F," -r, --recursive recurse into directories\n"); + rprintf(F," -R, --relative use relative path names\n"); @@ -299,6 +305,9 @@ void usage(enum logcode F) rprintf(F," -H, --hard-links preserve hard links\n"); rprintf(F," -p, --perms preserve permissions\n"); @@ -5590,7 +5599,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 }, {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, -@@ -1083,6 +1095,24 @@ int parse_arguments(int *argc, const cha +@@ -1076,6 +1088,24 @@ int parse_arguments(int *argc, const cha usage(FINFO); exit_cleanup(0); @@ -5615,7 +5624,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1529,6 +1559,10 @@ void server_options(char **args,int *arg +@@ -1521,6 +1551,10 @@ void server_options(char **args,int *arg if (preserve_hard_links) argstr[x++] = 'H'; @@ -5897,6 +5906,15 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. /* We have replacement versions of these if they're missing. */ --- old/rsync.yo +++ new/rsync.yo +@@ -300,7 +300,7 @@ to the detailed description below for a + -v, --verbose increase verbosity + -q, --quiet suppress non-error messages + -c, --checksum skip based on checksum, not mod-time & size +- -a, --archive archive mode; same as -rlptgoD (no -H) ++ -a, --archive archive mode; same as -rlptgoD (no -H, -A) + --no-OPTION turn off an implied OPTION (e.g. --no-D) + -r, --recursive recurse into directories + -R, --relative use relative path names @@ -321,6 +321,7 @@ to the detailed description below for a -H, --hard-links preserve hard links -p, --perms preserve permissions @@ -5905,7 +5923,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. --chmod=CHMOD change destination permissions -o, --owner preserve owner (super-user only) -g, --group preserve group -@@ -745,7 +746,9 @@ quote(itemize( +@@ -746,7 +747,9 @@ quote(itemize( permissions, though the bf(--executability) option might change just the execute permission for the file. it() New files get their "normal" permission bits set to the source @@ -5916,7 +5934,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. their special permission bits disabled except in the case where a new directory inherits a setgid bit from its parent directory. )) -@@ -776,9 +779,11 @@ The preservation of the destination's se +@@ -777,9 +780,11 @@ The preservation of the destination's se directories when bf(--perms) is off was added in rsync 2.6.7. Older rsync versions erroneously preserved the three special permission bits for newly-created files when bf(--perms) was off, while overriding the @@ -5931,7 +5949,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. dit(bf(-E, --executability)) This option causes rsync to preserve the executability (or non-executability) of regular files when bf(--perms) is -@@ -796,6 +801,15 @@ quote(itemize( +@@ -797,6 +802,15 @@ quote(itemize( If bf(--perms) is enabled, this option is ignored. @@ -5947,7 +5965,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. dit(bf(--chmod)) This option tells rsync to apply one or more comma-separated "chmod" strings to the permission of the files in the transfer. The resulting value is treated as though it was the permissions -@@ -1377,8 +1391,8 @@ if the receiving rsync is at least versi +@@ -1378,8 +1392,8 @@ if the receiving rsync is at least versi with older versions of rsync, but that also turns on the output of other verbose messages). @@ -5958,7 +5976,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. type of update being done, bf(X) is replaced by the file-type, and the other letters represent attributes that may be output if they are being modified. -@@ -1427,7 +1441,11 @@ quote(itemize( +@@ -1428,7 +1442,11 @@ quote(itemize( sender's value (requires bf(--owner) and super-user privileges). it() A bf(g) means the group is different and is being updated to the sender's value (requires bf(--group) and the authority to set the group). -- 2.34.1