It’s merged - thanks for the fix, @kit-ty-kate! Just cross-posting the comment I made with examples of how this changes:
- If you are in a 4.13 switch (e.g.
opam switch create 4.13 ocaml-base-compiler.4.13.0) and you
opam install merlin, you will get the 4.13 preview, but it will upgrade when the upstream release happens
- If you are in a 4.12 switch (e.g.
opam switch create 4.12 ocaml-base-compiler.4.12.1) and you
opam install merlin, you will get 4.3.1-412 (i.e. latest stable) as before
- opam will not upgrade to OCaml 4.13 if you have installed merlin in the switch and, when doing
opam switch create . opam will not select 4.13 if merlin (or lsp-server) are included in the dependencies of the opam files which get pinned.
So, for example:
opam switch create my-project ocaml-base-compiler.4.12.1
opam switch set-invariant ocaml-base-compiler
opam install merlin
will stick with OCaml 4.12.1, but if you:
opam remove merlin
you’ll get upgraded to OCaml 4.13.0. NB in opam 2.0.x, none of this applies - you’ll get the preview version, but opam 2.0.x doesn’t tend to upgrade compilers.