[Unison-hackers] [unison-svn] r456 - in trunk/src: . ubase

[bcpierce@seas.upenn.edu]

Author: bcpierce
Date: 2010-07-19 09:04:26 -0400 (Mon, 19 Jul 2010)
New Revision: 456

Modified:
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
   trunk/src/ubase/myMap.mli
   trunk/src/uitext.ml
   trunk/src/update.ml
   trunk/src/update.mli
Log:
* Small patch from Stephane Glondu to make Unison compile with Ocaml 3.12.



Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2010-06-06 12:43:26 UTC (rev 455)
+++ trunk/src/RECENTNEWS	2010-07-19 13:04:26 UTC (rev 456)
@@ -1,3 +1,9 @@
+CHANGES FROM VERSION 2.42.-29
+
+* Small patch from Stephane Glondu to make Unison compile with Ocaml 3.12.
+
+
+-------------------------------
 CHANGES FROM VERSION 2.41.-27
 
 * Try again to fix version number

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2010-06-06 12:43:26 UTC (rev 455)
+++ trunk/src/mkProjectInfo.ml	2010-07-19 13:04:26 UTC (rev 456)
@@ -5,8 +5,8 @@
 
 let projectName = "unison"
 let majorVersion = 2
-let minorVersion = 41
-let pointVersionOrigin = 452 (* Revision that corresponds to point version 0 *)
+let minorVersion = 42
+let pointVersionOrigin = 454 (* Revision that corresponds to point version 0 *)
 
 (* Documentation:
    This is a program to construct a version of the form Major.Minor.Point,
@@ -57,3 +57,4 @@
 
 
 
+

Modified: trunk/src/ubase/myMap.mli
===================================================================
--- trunk/src/ubase/myMap.mli	2010-06-06 12:43:26 UTC (rev 455)
+++ trunk/src/ubase/myMap.mli	2010-07-19 13:04:26 UTC (rev 456)
@@ -1,6 +1,6 @@
 (*
 This file is taken from the Objective Caml standard library.
-Some functions has been added to suite Unison needs.
+Some functions have been added to suit Unison's needs.
 *)
 (***********************************************************************)
 (*                                                                     *)

Modified: trunk/src/uitext.ml
===================================================================
--- trunk/src/uitext.ml	2010-06-06 12:43:26 UTC (rev 455)
+++ trunk/src/uitext.ml	2010-07-19 13:04:26 UTC (rev 456)
@@ -48,8 +48,7 @@
 
 let cbreakMode = ref None
 
-(* FIX: this may also work with Cygwin, but someone needs to try it... *)
-let supportSignals = Util.osType = `Unix (*|| Util.isCygwin*)
+let supportSignals = Util.osType = `Unix || Util.isCygwin
 
 let rawTerminal () =
   match !cbreakMode with

Modified: trunk/src/update.ml
===================================================================
--- trunk/src/update.ml	2010-06-06 12:43:26 UTC (rev 455)
+++ trunk/src/update.ml	2010-07-19 13:04:26 UTC (rev 456)
@@ -1089,7 +1089,9 @@
        Unison will use the modification time and length of a file as a
        `pseudo inode number' \
        when scanning replicas for updates, \
-       instead of reading the full contents of every file.  Under \
+       instead of reading the full contents of every file.  (This does not \
+       apply to the very first run, when Unison will always scan \
+       all files regarless of this switch).  Under \
        Windows, this may cause Unison to miss propagating an update \
        if the modification time and length of the \
        file are both unchanged by the update.  However, Unison will never \

Modified: trunk/src/update.mli
===================================================================
--- trunk/src/update.mli	2010-06-06 12:43:26 UTC (rev 455)
+++ trunk/src/update.mli	2010-07-19 13:04:26 UTC (rev 456)
@@ -1,7 +1,7 @@
 (* Unison file synchronizer: src/update.mli *)
 (* Copyright 1999-2010, Benjamin C. Pierce (see COPYING for details) *)
 
-module NameMap : Map.S with type key = Name.t
+module NameMap : MyMap.S with type key = Name.t
 
 type archive =
     ArchiveDir of Props.t * archive NameMap.t