summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Pierce <bcpierce002017@gmail.com>2018-01-27 08:41:15 -0500
committerBenjamin Pierce <bcpierce002017@gmail.com>2018-01-27 08:41:15 -0500
commit393129a1ce023aa2f919ba03619eaa3472f97a9c (patch)
treeddc411a511781ccde775eb982e79412d4d7f33fc
parent2ebf4d4b65241d319dd56eff8a68ab5da37825ce (diff)
downloadunison-393129a1ce023aa2f919ba03619eaa3472f97a9c.zip
unison-393129a1ce023aa2f919ba03619eaa3472f97a9c.tar.gz
unison-393129a1ce023aa2f919ba03619eaa3472f97a9c.tar.bz2
Better fix
-rw-r--r--src/remote.ml10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/remote.ml b/src/remote.ml
index 2d5f622..8551bd0 100644
--- a/src/remote.ml
+++ b/src/remote.ml
@@ -922,10 +922,16 @@ let connectionHeader =
Scanf.sscanf Sys.ocaml_version "%d.%d.%d" (fun x y z -> (x,y,z)) in
let compiler =
if major < 4
- || major = 4 && minor < 1
- || major = 4 && minor = 1 && patchlevel <= 1
+ || major = 4 && minor < 2
+ || major = 4 && minor = 2 && patchlevel <= 1
then "<= 4.01.1"
else ">= 4.01.2"
+ (* BCP: These strings seem wrong -- they should say 4.02,
+ not 4.01, according to my understanding of when the breaking
+ change happened. However, I'm nervous about breaking installations
+ that are working, so I'm going to leave it. Hopefully we are
+ far enough beyond these OCaml versions that it doesn't matter
+ anyway. *)
in "Unison " ^ Uutil.myMajorVersion ^ " with OCaml " ^ compiler ^ "\n"
let rec checkHeader conn buffer pos len =