*** empty log message ***

2 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 74dafdc0e..2d2f63327 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,18 @@
-2006-03-08  Paul Eggert  <eggert@cs.ucla.edu>
+2006-03-10  Jim Meyering  <jim@meyering.net>
 
 	* Version 6.0-cvs.
 
+	Fix a bug whereby a user with write access to a directory being removed
+	could cause the removal of that directory to fail with an erroneous
+	diagnostic about a directory cycle.  Reported by Vineet Chadha.
+
+	* NEWS: Mention this.
+	* src/remove.c (AD_pop_and_chdir): If the directory we're about to
+	leave (and try to rmdir) is the one whose dev_ino is being used to
+	detect a cycle, reset cycle_check_state.dev_ino to that of the parent.
+
+2006-03-08  Paul Eggert  <eggert@cs.ucla.edu>
+
 	* NEWS: Document dd's new 'directory' and 'nolinks' flags.
 	* src/dd.c (set_fd_flags): Handle file-creation flags on file
 	descriptors, rather than ignoring them.
diff --git a/NEWS b/NEWS
index cfc50c8e8..29c8089c8 100644
--- a/NEWS
+++ b/NEWS
@@ -115,7 +115,7 @@ GNU coreutils NEWS                                    -*- outline -*-
   rm -r no longer fails to remove an inaccessible and empty directory
 
   rm -r's cycle detection code can no longer be tricked into reporting
-  a false positive.
+  a false positive (introduced in fileutils-4.1.9).
 
   sort would fail for large inputs (~50MB) on systems with a buggy
   mkstemp function.  sort and tac now use the replacement mkstemp