X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaSync.ml;h=b54c67790c46ea4618cd964062ea16a8c6cf8e85;hb=0a23b2111c404a0a7141a0d5729cf3aa0bdf7798;hp=29e19c690ea20744954a79b4bdcc260d007d6324;hpb=cb408b9ea336cd8efb990f7a1c88b566ccf0bd2e;p=helm.git diff --git a/helm/matita/matitaSync.ml b/helm/matita/matitaSync.ml index 29e19c690..b54c67790 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 = @@ -83,7 +92,7 @@ let add_aliases_for_object status suri = | Cic.CurrentProof _ -> assert false let paths_and_uris_of_obj uri status = - let basedir = get_string_option status "basedir" in + let basedir = get_string_option status "basedir" ^ "/xml" in let innertypesuri = UriManager.innertypesuri_of_uri uri in let bodyuri = UriManager.bodyuri_of_uri uri in let innertypesfilename = Str.replace_first (Str.regexp "^cic:") ""