diff --git a/CHANGES.md b/CHANGES.md index 26377e6a61..9031699ae3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,8 @@ ### 0.9.8 +* Fix missing zero padding for date pretty-printing (#228, @dsheets) +* Update the tests to use `ocaml-git.1.6.0` +* Improve the style of the HTTP commit graph. * Constraint the string tags to contain only alpha-numeric characters and few mores (`-`, `_` and `/`) (#186) * Fix a race condition in `Irmin.clone`. (#221) diff --git a/lib/irmin.mli b/lib/irmin.mli index 244e987244..e900b2d6e8 100644 --- a/lib/irmin.mli +++ b/lib/irmin.mli @@ -873,7 +873,7 @@ module Contents: sig module Cstruct: S with type t = Cstruct.t and module Path = Path.String_list (** Cstruct values where only the last modified value is kept on - merge. If the value has been modified concurrently, the [merge[ + merge. If the value has been modified concurrently, the [merge] function raises [Conflict]. *) (** Contents store. *) @@ -1577,6 +1577,7 @@ module Private: sig and type commit = S.key end + (** The signature for slices. *) module Slice: sig diff --git a/lib_test/test_store.ml b/lib_test/test_store.ml index 5c72635c5a..e9098e4bd5 100644 --- a/lib_test/test_store.ml +++ b/lib_test/test_store.ml @@ -894,17 +894,25 @@ module Make (S: Irmin.S) = struct match !result with None -> assert false | Some t -> t in let clone () = - S.clone task (t "clone") (S.Tag.of_hum "test") >|= function + S.clone task (t "clone") (S.Tag.of_hum "test") >>= function | `Ok t -> begin match !result with | None -> result := Some t | Some _ -> Alcotest.fail "should be duplicated!" - end + end; + Lwt.return_unit | `Duplicated_tag -> - begin match !result with - | None -> Alcotest.fail "should not be duplicated!" - | Some _ -> () - end + let rec wait n = + begin match !result with + | None -> + if n <= 0 then Alcotest.fail "should not be duplicated!" + else + Lwt_unix.sleep 0.1 >>= fun () -> + wait (n-1) + | Some _ -> Lwt.return_unit + end + in + wait 10 | `Empty_head -> Alcotest.fail "empty head" in S.remove_tag (t "prepare") (S.Tag.of_hum "test") >>= fun () ->