robur/builder-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

duniverse diff: check for hashes on both r and l

Browse source
This commit is contained in:
Hannes Mehnert 2023-05-31 17:11:47 +02:00
parent 62965d4f90
commit 12383cbd06
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
opamdiff/opamdiff.ml
View file

@ -93,9 +93,14 @@ let duniverse_diff l r =
(* l and r are lists of pairs, with the hash kind and its value *) (* l and r are lists of pairs, with the hash kind and its value *)
List.for_all (fun (h, v) -> List.for_all (fun (h, v) ->
match List.assoc_opt h r with match List.assoc_opt h r with
| None -> true | None -> false
| Some v' -> String.equal v v') | Some v' -> String.equal v v')
l l &&
List.for_all (fun (h, v) ->
match List.assoc_opt h l with
| None -> false
| Some v' -> String.equal v v')
r
in in
let _ = let _ =
M.merge (fun key l r -> M.merge (fun key l r ->