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

[bcpierce@seas.upenn.edu]

Author: bcpierce
Date: 2010-07-24 10:07:55 -0400 (Sat, 24 Jul 2010)
New Revision: 462

Modified:
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
   trunk/src/test.ml
   trunk/src/xferhint.ml
Log:
* A small fix suggested by Jerome.  Still thinking about what needs to
  chance to get newly created files to transfer without failing.


Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2010-07-24 12:40:06 UTC (rev 461)
+++ trunk/src/RECENTNEWS	2010-07-24 14:07:55 UTC (rev 462)
@@ -1,3 +1,9 @@
+CHANGES FROM VERSION 2.43.6
+
+* A small fix suggested by Jerome.  Still thinking about what needs to
+  chance to get newly created files to transfer without failing.
+
+-------------------------------
 CHANGES FROM VERSION 2.43.0
 
 * See if we can get revisionString to update automatically now...

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2010-07-24 12:40:06 UTC (rev 461)
+++ trunk/src/mkProjectInfo.ml	2010-07-24 14:07:55 UTC (rev 462)
@@ -51,3 +51,4 @@
 Printf.printf "VERSION=%d.%d.%d\n" majorVersion minorVersion pointVersion;;
 Printf.printf "NAME=%s\n" projectName;;
 
+

Modified: trunk/src/test.ml
===================================================================
--- trunk/src/test.ml	2010-07-24 12:40:06 UTC (rev 461)
+++ trunk/src/test.ml	2010-07-24 14:07:55 UTC (rev 462)
@@ -351,6 +351,7 @@
       put R1 (Dir ["x", File "newcontents"]); sync();
       check "2a" R1 (Dir ["x", File "newcontents"]);
       check "2b" R2 (Dir ["x", File "newcontents"]);
+
       (* Start again *)
       put R1 (Dir []); put R2 (Dir []); sync();
       (* Create a file on both sides with different contents *)
@@ -360,6 +361,13 @@
       put R1 (Dir ["x", File "f00"]); sync();
       check "3a" R1 (Dir ["x", File "f00"]);
       check "3b" R2 (Dir ["x", File "f00"]);
+
+      (* Start again *)
+      put R1 (Dir []); put R2 (Dir []); sync();
+      (* Create a new file on one side only *)
+      put R1 (Dir ["x", File "foo"]); sync();
+      (* Check that change is propagated *)
+      check "4" R2 (Dir ["x", File "foo"]);
     );
 
   raise (Util.Fatal "Skipping some tests -- remove me!\n"); 

Modified: trunk/src/xferhint.ml
===================================================================
--- trunk/src/xferhint.ml	2010-07-24 12:40:06 UTC (rev 461)
+++ trunk/src/xferhint.ml	2010-07-24 14:07:55 UTC (rev 462)
@@ -56,7 +56,7 @@
     None
 
 let insertEntry fspath path fp =
-  if Prefs.read xferbycopying then begin
+  if Prefs.read xferbycopying && not (Os.isPseudoFingerprint fp) then begin
     debug (fun () ->
       Util.msg "insertEntry: fspath=%s, path=%s, fp=%s\n"
         (Fspath.toDebugString fspath)