Commits

Stephen Weeks  committed 07d369f

resolved conflicts

  • Participants
  • Parent commits 66c4d66

Comments (0)

Files changed (1)

File omake_server.ml

   val set : Id.t -> var -> bool -> unit deferred
   val get : Id.t -> var -> bool deferred
   val set_emacs_env : Writer.t -> Id.t -> unit deferred
-<<<<<<< ANCESTOR
-=======
   val setenv_all : Id.t -> unit deferred
->>>>>>> OTHER
 end = struct
   type var =
   | X_LIBRARY_INLINING
 
   let get = Sys.getenv
 
-<<<<<<< ANCESTOR
-  let set ~key ~data = Unix.putenv ~key ~data
-=======
   let setenv ~key ~data = Unix.putenv ~key ~data
->>>>>>> OTHER
 
   let get_exn key = match get key with
     | None -> failwithf "No env: %s" key ()
 
   let assure_set ~default ~key =
     match get key with
-<<<<<<< ANCESTOR
-    | None -> set ~key ~data:default
-=======
     | None -> setenv ~key ~data:default
->>>>>>> OTHER
     | Some _ -> ()
 
   let () = begin
   let set id x b =
     env id >>= fun t ->
     var_to_set x t b;
-<<<<<<< ANCESTOR
-=======
     setenv ~key:(var_to_string x) ~data:(string_of_bool b);
->>>>>>> OTHER
     save id t
 
-<<<<<<< ANCESTOR
-=======
   let setenv_all id =
     env id >>| fun t -> (
       setenv ~key:(var_to_string X_LIBRARY_INLINING) ~data:(string_of_bool t.x_library_inlining);
       setenv ~key:(var_to_string LIMIT_SUBDIRS_FOR_SPEED) ~data:(string_of_bool t.limit_subdirs_for_speed);
     )
 
->>>>>>> OTHER
   let set_emacs_env writer id =
     env id >>= fun t ->
     To_emacs.send writer " \
       t.link_executables
       t.version_util_support
       t.limit_subdirs_for_speed
-<<<<<<< ANCESTOR
-=======
 
->>>>>>> OTHER
 end
 
 (* -------------------------------------------------------------------------- *)
     | Q.Create create ->
       let id = create.C.id in
       let ids = Id.to_string id in
-<<<<<<< MINE
       begin
         Env.setenv_all id >>= fun () ->
         Models.create create >>| function
         | Ok () -> Server.logf "Model created: %s" ids
         | Error `Already_exists -> model_exists id
-||||||| ANCESTOR
-      begin Models.create create >>| function
-      | Ok () -> Server.logf "Model created: %s" ids
-      | Error `Already_exists -> model_exists id
-=======
-      begin
-        Env.setenv_all id >>= fun () ->
-        Models.create create >>| function
-      | Ok () -> Server.logf "Model created: %s" ids
-      | Error `Already_exists -> model_exists id
->>>>>>> OTHER
       end
     | Q.Kill id ->
       let ids = Id.to_string id in