[Unison-hackers] [unison-svn] r376 - trunk/src

[vouillon@seas.upenn.edu]

Author: vouillon
Date: 2009-07-17 04:15:02 -0400 (Fri, 17 Jul 2009)
New Revision: 376

Modified:
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
   trunk/src/update.ml
Log:
* Correction to previous fix: do not perform the optimization for
  directories with ignored children *in the archive*. (The previous
  fix was also rejecting directories with ignored children on disk,
  which is way too conservative.)


Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2009-07-16 22:13:45 UTC (rev 375)
+++ trunk/src/RECENTNEWS	2009-07-17 08:15:02 UTC (rev 376)
@@ -1,5 +1,13 @@
 CHANGES FROM VERSION 2.36.-27
 
+* Correction to previous fix: do not perform the optimization for
+  directories with ignored children *in the archive*. (The previous
+  fix was also rejecting directories with ignored children on disk,
+  which is way too conservative.)
+
+-------------------------------
+CHANGES FROM VERSION 2.36.-27
+
 * Fixed small bug in new update detection optimization:
   do not perform the optimization for directories with ignored
   children in the archive.  Indeed, we cannot rely on the archive in

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2009-07-16 22:13:45 UTC (rev 375)
+++ trunk/src/mkProjectInfo.ml	2009-07-17 08:15:02 UTC (rev 376)
@@ -94,3 +94,4 @@
 
 
 
+

Modified: trunk/src/update.ml
===================================================================
--- trunk/src/update.ml	2009-07-16 22:13:45 UTC (rev 375)
+++ trunk/src/update.ml	2009-07-17 08:15:02 UTC (rev 376)
@@ -1364,7 +1364,7 @@
   let handleChild nm archive status =
     let path' = Path.child path nm in
     if Globals.shouldIgnore path' then begin
-      hasIgnoredChildren := true;
+      hasIgnoredChildren := !hasIgnoredChildren || (archive <> NoArchive);
       debugignore (fun()->Util.msg "buildUpdateChildren: ignoring path %s\n"
                             (Path.toString path'));
       archive