Mercurial > urweb

comparison src/settings.sml @ 2270:1e3ba868f8bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Ziv Scully <ziv@mit.edu>
date Mon, 19 Oct 2015 14:42:22 -0400
parents a647a1560628 74c762002352
children 985c8016b592
comparison
equal deleted inserted replaced
2269:f7bc7c11a656 2270:1e3ba868f8bf
883 let 883 let
884 val path = OS.Path.concat (!filePath, LoadFromFilename) 884 val path = OS.Path.concat (!filePath, LoadFromFilename)
885 in 885 in
886 case SM.find (!files, Uri) of 886 case SM.find (!files, Uri) of
887 SOME (path', _) => 887 SOME (path', _) =>
888 if path' = path then 888 if OS.Path.mkCanonical path' = OS.Path.mkCanonical path then
889 () 889 ()
890 else 890 else
891 ErrorMsg.error ("Two different files requested for URI " ^ Uri ^ " ( " ^ path' ^ " vs. " ^ path ^ ")") 891 ErrorMsg.error ("Two different files requested for URI " ^ Uri ^ " ( " ^ path' ^ " vs. " ^ path ^ ")")
892 | NONE => 892 | NONE =>
893 let 893 let