[Unison-hackers] patches for 2.10.2 and 2.12.0

[Zvezdan Petkovic]

On Sun, May 22, 2005 at 04:51:13PM -0400, Zvezdan Petkovic wrote:
> I'm sending the patches for beta in the next message.

Here are patches for 2.12.0 in my port.

Jerome, is that all I need?

Max, I've noticed that the line numbers of your patch to update.ml
do not correspond to the line numbers of my patch in either 2.12.0 or
2.10.2.  Am I missing something?

	Zvezdan
-------------- next part --------------
$OpenBSD$
Post-release developer patch.
Fix the problem with comparison of files using diff
when the files are on two different hosts.
--- files.ml.orig	Sat Mar 12 11:17:59 2005
+++ files.ml	Sun May 22 08:13:59 2005
@@ -476,7 +476,7 @@ let rec diff root1 path1 ui1 root2 path2
              (Update.translatePath root2 path2 >>= (fun path2 ->
               Copy.file root2 path2 root1 workingDir tmppath realPath
                 `Copy (Props.setLength Props.fileSafe (Props.length desc2))
-                 fp1 ress1 id));
+                 fp2 ress2 id));
            displayDiff
 	     (Fspath.concat workingDir realPath)
              (Fspath.concat workingDir tmppath);
@@ -494,7 +494,7 @@ let rec diff root1 path1 ui1 root2 path2
               (* Note that we don't need the ressource fork *)
               Copy.file root1 path1 root2 workingDir tmppath realPath
                 `Copy (Props.setLength Props.fileSafe (Props.length desc1))
-                 fp2 ress2 id));
+                 fp1 ress1 id));
            displayDiff
              (Fspath.concat workingDir tmppath)
 	     (Fspath.concat workingDir realPath);
-------------- next part --------------
$OpenBSD$
Post-release developer patch.
Update archive timestamps to avoid defeating fastcheck on Windows.
--- update.ml.orig	Sat Mar 12 11:17:58 2005
+++ update.ml	Sun May 22 16:06:08 2005
@@ -1634,7 +1634,7 @@ let rec buildUpdate archive fspath fullp
              Note that we may also put NoArchive deep inside an
              archive...
           *)
-          (ArchiveDir (desc, NameMap.add name' child otherChildren),
+          (ArchiveDir (desc, NameMap.add name' arch otherChildren),
            updates)
 
 (* for the given path, find the archive and compute the list of update