[Unison-hackers] [unison-svn] r508 - in trunk: doc src

[bcpierce at seas.upenn.edu]

Author: bcpierce
Date: 2012-09-14 10:50:07 -0400 (Fri, 14 Sep 2012)
New Revision: 508

Modified:
   trunk/doc/unison-manual.tex
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
   trunk/src/update.ml
Log:
* Add a note to the 'new archives not identical' error message
  explaining that this can happen because Unison binaries compiled
  with OCaml 3 and OCaml 4 are incompatible.



Modified: trunk/doc/unison-manual.tex
===================================================================
--- trunk/doc/unison-manual.tex	2012-09-14 08:54:50 UTC (rev 507)
+++ trunk/doc/unison-manual.tex	2012-09-14 14:50:07 UTC (rev 508)
@@ -302,7 +302,7 @@
 
 Once you've got OCaml installed, grab a copy of the Unison sources,
 unzip and untar them, change to the new \showtt{unison} directory, and
-type ``{\tt make UISTYLE=text}.''
+type ``{\tt make UISTYLE=text}''.
 The result should be an executable file called \showtt{unison}.
 Type \showtt{./unison} to make sure the program is executable.  You
 should get back a usage message.
@@ -1865,7 +1865,8 @@
 \item \verb|[xyz]| matches any character from the set $\{{\tt x},
   {\tt y}, {\tt z} \}$
 \item \verb|{a,bb,ccc}| matches any one of \verb|a|, \verb|bb|, or
-  \verb|ccc|. 
+  \verb|ccc|.  (Be careful not to put extra spaces after the commas:
+  these will be interpreted literally as part of the strings to be matched!) 
 \end{itemize}
 \item 
 The path separator in path patterns is always the

Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2012-09-14 08:54:50 UTC (rev 507)
+++ trunk/src/RECENTNEWS	2012-09-14 14:50:07 UTC (rev 508)
@@ -1,3 +1,11 @@
+CHANGES FROM VERSION 2.46.3
+
+* Add a note to the 'new archives not identical' error message
+  explaining that this can happen because Unison binaries compiled
+  with OCaml 3 and OCaml 4 are incompatible.
+
+
+-------------------------------
 CHANGES FROM VERSION 2.46.2
 
 * Fix Unix.readlink invalid argument error under Windows

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2012-09-14 08:54:50 UTC (rev 507)
+++ trunk/src/mkProjectInfo.ml	2012-09-14 14:50:07 UTC (rev 508)
@@ -82,3 +82,4 @@
 
 
 
+

Modified: trunk/src/update.ml
===================================================================
--- trunk/src/update.ml	2012-09-14 08:54:50 UTC (rev 507)
+++ trunk/src/update.ml	2012-09-14 14:50:07 UTC (rev 508)
@@ -757,6 +757,8 @@
         "Internal error: On-disk archives are not identical.\n"
       ^ "\n"
       ^ "This can happen when both machines have the same hostname.\n"
+      ^ "It can also happen when one copy of Unison has been compiled with\n"
+      ^ "OCaml version 3 and one with OCaml version 4.\n"
       ^ "\n"
       ^ "If this is not the case and you get this message repeatedly, please:\n"
       ^ "  a) Send a bug report to unison-users at yahoogroups.com (you may need\n"