The branch, master has been updated via ff1792ed Improve `--copy-links` description. via b985123d Allow someone to specify scratchbase=FOO for runtests.sh. from c9832790 Improve rrsync usage and some more NEWS tweaks.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit ff1792edf14e718934de271219f6e95f6497363a Author: Wayne Davison <wa...@opencoder.net> Date: Sun Jan 9 12:20:46 2022 -0800 Improve `--copy-links` description. commit b985123d2ebae4d9950585a717067beb10fd4b5f Author: Wayne Davison <wa...@opencoder.net> Date: Sun Jan 9 11:40:41 2022 -0800 Allow someone to specify scratchbase=FOO for runtests.sh. ----------------------------------------------------------------------- Summary of changes: rsync.1.md | 23 +++++++++++++++-------- runtests.sh | 2 +- 2 files changed, 16 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/rsync.1.md b/rsync.1.md index 37e2f9b0..2ad467c8 100644 --- a/rsync.1.md +++ b/rsync.1.md @@ -1044,14 +1044,21 @@ your home directory (remove the '=' for that). 0. `--copy-links`, `-L` - When symlinks are encountered, the item that they point to (the referent) - is copied, rather than the symlink. In older versions of rsync, this - option also had the side-effect of telling the receiving side to follow - symlinks, such as symlinks to directories. In a modern rsync such as this - one, you'll need to specify `--keep-dirlinks` (`-K`) to get this extra - behavior. The only exception is when sending files to an rsync that is too - old to understand `-K` -- in that case, the `-L` option will still have the - side-effect of `-K` on that older receiving rsync. + The sender transforms each symlink encountered in the transfer into the + referent item, following the symlink chain to the file or directory that it + references. If a symlink chain is broken, an error is output and the file + is dropped from the transfer. On the receiving side, any existing symlinks + in the destination directories are replaced with the non-symlinks that the + sender specifies (though any destination filenames that do not match a name + in the transfer can remain as symlinks if rsync is not deleting files). + + In versions of rsync prior to 2.6.3, this option also had the side-effect + of telling the receiving side to follow symlinks, such as a symlink to a + directory. A modern rsync does not do this, though you can choose to + specify `--keep-dirlinks` (`-K`) if you want rsync to treat a symlink to a + directory on the receiving side as if it were a real directory. Remember + that it's the version of rsync on the receiving side that determines how it + reacts to existing destination symlinks when this option is in effect. 0. `--copy-unsafe-links` diff --git a/runtests.sh b/runtests.sh index e0236c9e..5c204dc9 100755 --- a/runtests.sh +++ b/runtests.sh @@ -238,7 +238,7 @@ failed=0 # failure to aid investigation. We don't remove the testtmp subdir at # the end so that it can be configured as a symlink to a filesystem that # has ACLs and xattr support enabled (if desired). -scratchbase="$TOOLDIR"/testtmp +scratchbase="${scratchbase:-$TOOLDIR}"/testtmp echo " scratchbase=$scratchbase" [ -d "$scratchbase" ] || mkdir "$scratchbase" -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs