.

diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index 57b213704a6d71d008032168df74b2df1d6f8c9b..e015eef1728c5f915aaf4120933b0913d3a05ec7 100644 (file)
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -2,7 +2,16 @@
 
        * Version 4.1.6.
 
-       * src/cp.c (main): Fail if -r is specified after --archive (-a)
+       * src/copy.c (copy_internal): For each symlink copied by cp -r,
+       issue a warning that `cp -r' is not portable.
+
+       * src/cp.c (main): Revert change of 2001-12-29.  With this change,
+       cp -r once again preserves symlinks.
+       (usage): Document the original (now-restored) behavior.
+       * tests/cp/r-vs-symlink: Reflect changed semantics of cp's -r option.
+
+       * src/cp.c (main): Warn when -r is specified before --archive (-a).
+       * src/cp.c (main): Fail when -r is specified after --archive (-a)
        on the command line.
 
        * src/copy.c (copy_reg): Detect abuse of a race condition