Mercurial > urweb

changeset 2127:8beeb4f761b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix interpretation of 'file' argument paths
author Adam Chlipala <adam@chlipala.net>
date Sun, 08 Mar 2015 10:55:05 -0400
parents ec1614fb97bb
children 248e2b32954b
files src/settings.sml tests/files.urp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/settings.sml	Fri Mar 06 09:46:21 2015 -0500
+++ b/src/settings.sml	Sun Mar 08 10:55:05 2015 -0400
@@ -867,7 +867,7 @@
 
 fun addFile {Uri, LoadFromFilename} =
     let
-        val path = OS.Path.joinDirFile {dir = !filePath, file = LoadFromFilename}
+        val path = OS.Path.mkAbsolute {relativeTo = !filePath, path = LoadFromFilename}
     in
         case SM.find (!files, Uri) of
             SOME (path', _) =>
--- a/tests/files.urp	Fri Mar 06 09:46:21 2015 -0500
+++ b/tests/files.urp	Sun Mar 08 10:55:05 2015 -0400
@@ -1,6 +1,6 @@
 rewrite all Files/*
 file /hello_world.txt hello.txt
 file /img/web.png web.png
-file /files.urp files.urp
+file /files.urp ./files.urp
 
 files