X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaSync.ml;h=f42dad76927cb693cf15c8537a95d326b750103e;hb=08791e80816548121e81e04d3ead8c9a5171d033;hp=23e3b048f45bd015a184d2b6273b9cd257c1406e;hpb=63722506a5e378f3e05b46612cb91c132d994082;p=helm.git diff --git a/helm/matita/matitaSync.ml b/helm/matita/matitaSync.ml index 23e3b048f..f42dad769 100644 --- a/helm/matita/matitaSync.ml +++ b/helm/matita/matitaSync.ml @@ -34,7 +34,16 @@ let alias_diff ~from status = if not (Map.mem domain_item from.aliases) then Map.add domain_item codomain_item acc else - acc) + begin + try + let description1 = fst(Map.find domain_item from.aliases) in + let description2 = fst(Map.find domain_item status.aliases) in + if description1 <> description2 then + Map.add domain_item codomain_item acc + else + acc + with Not_found -> acc + end) status.aliases Map.empty let set_proof_aliases status aliases = @@ -222,7 +231,7 @@ let time_travel ~present ~past = MatitaLog.debug "l2:"; List.iter MatitaLog.debug l2 -let remove uri = +let remove ~verbose uri = let derived_uris_of_uri uri = UriManager.innertypesuri_of_uri uri :: (match UriManager.bodyuri_of_uri uri with @@ -237,10 +246,10 @@ let remove uri = List.iter (fun uri -> (try - MatitaLog.debug ("Removing: " ^ UriManager.string_of_uri uri); + if verbose then + MatitaLog.debug ("Removing: " ^ UriManager.string_of_uri uri); MatitaMisc.safe_remove (Http_getter.resolve' uri) with Http_getter_types.Key_not_found _ -> ()); remove_coercion uri; ignore (MatitaDb.remove_uri uri)) to_remove -