[Unison-hackers] Unison 2.40.1 - beta - bug

[Jerome Vouillon]

On Sun, Apr 11, 2010 at 03:58:15PM -0400, Joseph Collins wrote:
> It seems that root pairs like this now confuse unison:
> 
>      /utest
>      /archive/utest

Thanks a lot for your bug report.  Here is a patch that fixes the
problem.

-- Jerome

Index: fspath.ml
===================================================================
--- fspath.ml   (révision 426)
+++ fspath.ml   (copie de travail)
@@ -65,14 +65,15 @@
       (* differ                                                              *)
       let rec loop n =
         let i1 = len1-n in
-        if i1<0 then n+1 else
+        if i1<0 then n else
         let i2 = len2-n in
-        if i2<0 then n+1 else
+        if i2<0 then n else
         if compare (String.get f1 i1) (String.get f2 i2) = 0
         then loop (n+1)
         else n in
       loop 1 in
     let suffix f len =
+      if n > len then f else
       try
         let n' = String.rindex_from f (len-n) '/' in
         String.sub f (n'+1) (len-n'-1)