*** empty log message ***

diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index ae878e7fe2682ee4b3e31a95f5d3a85f04455df8..835f637fb078d04ba1aa7fa155f67de527b2cd73 100644 (file)
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -1,3 +1,12 @@
+2000-05-12  Jim Meyering  <meyering@lucent.com>
+
+       Unlike for mv, -i doesn't cancel the effect of -f
+       and -f doesn't cancel the effect of -i.
+       * src/cp.c (main) ['f']: Don't reset `x.interactive'.
+       ['i']: Don't reset `x.force'.
+       * src/copy.c (copy_internal): Fix force and interactive tests.
+       Patch from Michael Stone, reported by Jeff Sheinberg.
+
 2000-05-09  Jim Meyering  <meyering@lucent.com>
 
        * src/shred.c: Include sys/types.h in shred.c before including