*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 0b13f80..6bf6384 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,18 @@
-2006-06-01  Paul Eggert  <eggert@cs.ucla.edu>
+2006-06-03  Jim Meyering  <jim@meyering.net>
 
        * Version 6.0-cvs.
 
+       Make `cp --link --no-dereference' work also on systems where the
+       link system call cannot create a hard link to a symbolic link.
+       * src/copy.c (copy_internal) [LINK_FOLLOWS_SYMLINKS]: Don't use
+       the link syscall on a symlink when it would do the wrong thing.
+       Based on the patch by Aurelien Jarno: <http://bugs.debian.org/329451>
+       * tests/cp/link-no-deref: New file/test for the above.
+       * tests/cp/Makefile.am (TESTS): Add link-no-deref.
+       * NEWS: Mention the change (doesn't affect Linux).
+
+2006-06-01  Paul Eggert  <eggert@cs.ucla.edu>
+
        Fix some porting problems in the test cases reported by
        Ralf Wildenhues for HP-UX 11.23 in:
        http://lists.gnu.org/archive/html/bug-coreutils/2006-05/msg00238.html