[Unison-hackers] The diff-over-ssh patch for 2.10.2

[Jerome Vouillon]

On Fri, May 20, 2005 at 08:12:43PM +0100, Max Bowsher wrote:
> The diff-over-ssh patch for 2.10.2 does not seem to work for me. (Bug
> remains).

Here is the full patch for 2.10.2.  I forgot that 2.12 was already
half fixed...

-- Jerome

--- files.ml.orig       2004-09-06 21:15:46.000000000 +0200
+++ files.ml    2005-05-16 17:31:05.066531320 +0200
@@ -470,7 +470,7 @@
              (Update.translatePath root2 path2 >>= (fun path2 ->
               Copy.file root2 path2 root1 workingDir tmppath realPath
-                `Copy (Props.setLength Props.fileSafe (Props.length desc1))
-                 fp1 ress1 id));
+                `Copy (Props.setLength Props.fileSafe (Props.length desc2))
+                 fp2 ress2 id));
            displayDiff
             (Fspath.concat workingDir realPath)
              (Fspath.concat workingDir tmppath);
@@ -488,7 +488,7 @@
               (* Note that we don't need the ressource fork *)
               Copy.file root1 path1 root2 workingDir tmppath realPath
-                `Copy (Props.setLength Props.fileSafe (Props.length desc2))
-                 fp2 ress2 id));
+                `Copy (Props.setLength Props.fileSafe (Props.length desc1))
+                 fp1 ress1 id));
            displayDiff
              (Fspath.concat workingDir tmppath)
             (Fspath.concat workingDir realPath);