X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2f03ce67d695e16b1789aff3a155109dcbbbd25f..0b9414792835406d71b4cf8ed8e8f5163cac0b57:/rsync.yo diff --git a/rsync.yo b/rsync.yo index b2a8ad99..e013020a 100644 --- a/rsync.yo +++ b/rsync.yo @@ -1,5 +1,5 @@ mailto(rsync-bugs@samba.org) -manpage(rsync)(1)(28 Feb 2005)()() +manpage(rsync)(1)(15 Mar 2005)()() manpagename(rsync)(faster, flexible replacement for rcp) manpagesynopsis() @@ -380,6 +380,7 @@ to the detailed description below for a complete description. verb( --bwlimit=KBPS limit I/O bandwidth; KBytes per second --write-batch=FILE write a batched update to FILE --read-batch=FILE read a batched update from FILE + --protocol=NUM force an older protocol version to be used --checksum-seed=NUM set block/file checksum seed (advanced) -4, --ipv4 prefer IPv4 -6, --ipv6 prefer IPv6 @@ -1054,23 +1055,21 @@ The "%i" escape has a cryptic output that is 9 letters long. The general format is like the string bf(UXcstpoga)), where bf(U) is replaced by the kind 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 -updated. +modified. The update types that replace the bf(U) are as follows: quote(itemize( - it() A bf(<) means that a file is being transferred to the local host - (received). - it() A bf(>) means that a file is being transferred to the remote host + it() A bf(<) means that a file is being transferred to the remote host (sent). + it() A bf(>) means that a file is being transferred to the local host + (received). it() A bf(c) means that a local change/creation is occuring for the item - (such as the creation of a directory or a symlink). + (such as the creation of a directory or the changing of a symlink, etc.). it() A bf(h) means that the item is a hard-link to another item (requires bf(--hard-links)). - it() A bf(.) means that the item only has attributes that are being - changed. - it() A bf(=) means that the item is identical (this only only output for - higher levels of verbosity). + it() A bf(.) means that the item is not being updated (though it might + have attributes that are being modified). )) The file-types that replace the bf(X) are: bf(f) for a file, a bf(d) for a @@ -1106,7 +1105,7 @@ quote(itemize( )) One other output is possible: when deleting files, the "%i" will output -the string "deleting" for each item that is being removed (assuming that +the string "*deleting" for each item that is being removed (assuming that you are talking to a recent enough rsync that it logs deletions instead of outputting them as a verbose message). @@ -1277,6 +1276,14 @@ file previously generated by bf(--write-batch). If em(FILE) is "-" the batch data will be read from standard input. See the "BATCH MODE" section for details. +dit(bf(--protocol=NUM)) Force an older protocol version to be used. This +is useful for creating a batch file that is compatible with an older +version of rsync. For instance, if rsync 2.6.4 is being used with the +bf(--write-batch) option, but rsync 2.6.3 is what will be used to run the +bf(--read-batch) option, you should use "--protocol=28" (when creating the +batch file) to force the older protocol version to be used in the batch +file (assuming you can't upgrade the rsync on the reading system to 2.6.4). + dit(bf(-4, --ipv4) or bf(-6, --ipv6)) Tells rsync to prefer IPv4/IPv6 when creating sockets. This only affects sockets that rsync has direct control over, such as the outgoing socket when directly contacting an @@ -1856,7 +1863,7 @@ Caveats: The read-batch option expects the destination tree that it is updating to be identical to the destination tree that was used to create the batch update fileset. When a difference between the destination trees -is encountered the update might be discarded with no error (if the file +is encountered the update might be discarded with a warning (if the file appears to be up-to-date already) or the file-update may be attempted and then, if the file fails to verify, the update discarded with an error. This means that it should be safe to re-run a read-batch operation @@ -1871,10 +1878,10 @@ destination tree. The rsync version used on all destinations must be at least as new as the one used to generate the batch file. Rsync will die with an error if the protocol version in the batch file is too new for the batch-reading rsync -to handle. - -The bf(--dry-run) (bf(-n)) option does not work in batch mode and yields a runtime -error. +to handle. See also the bf(--protocol) option for a way to have the +creating rsync generate a batch file that an older rsync can understand. +(Note that batch files changed format in version 2.6.3, so mixing versions +older than that with newer versions will not work.) When reading a batch file, rsync will force the value of certain options to match the data in the batch file if you didn't set them to the same @@ -1958,6 +1965,7 @@ was made to manipulate 64-bit files on a platform that cannot support them; or an option was specified that is supported by the client and not by the server. dit(bf(5)) Error starting client-server protocol +dit(bf(6)) Daemon unable to append to log-file dit(bf(10)) Error in socket I/O dit(bf(11)) Error in file I/O dit(bf(12)) Error in rsync protocol data stream @@ -1968,6 +1976,7 @@ dit(bf(21)) Some error returned by waitpid() dit(bf(22)) Error allocating core memory buffers dit(bf(23)) Partial transfer due to error dit(bf(24)) Partial transfer due to vanished source files +dit(bf(25)) The --max-delete limit stopped deletions dit(bf(30)) Timeout in data send/receive enddit()