[Unison-hackers] [unison-svn] r483 - trunk/src

[schmitta at seas.upenn.edu]

Author: schmitta
Date: 2012-02-26 16:01:47 -0500 (Sun, 26 Feb 2012)
New Revision: 483

Modified:
   trunk/src/RECENTNEWS
   trunk/src/files.ml
   trunk/src/mkProjectInfo.ml
Log:
* Correctly quote the path when running merge commands


Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2012-02-26 12:56:45 UTC (rev 482)
+++ trunk/src/RECENTNEWS	2012-02-26 21:01:47 UTC (rev 483)
@@ -1,3 +1,8 @@
+CHANGES FROM VERSION 2.44.11
+
+* Correctly quote the path when running merge commands
+
+-------------------------------
 CHANGES FROM VERSION 2.44.10
 
 * Added option clientHostName. If specified, it will be used to as the client

Modified: trunk/src/files.ml
===================================================================
--- trunk/src/files.ml	2012-02-26 12:56:45 UTC (rev 482)
+++ trunk/src/files.ml	2012-02-26 21:01:47 UTC (rev 483)
@@ -733,7 +733,8 @@
   let cooked = Util.replacesubstring cooked "NEW2"     out2 in
   let cooked = Util.replacesubstring cooked "NEWARCH"  outarch in
   let cooked = Util.replacesubstring cooked "NEW" out1 in
-  let cooked = Util.replacesubstring cooked "PATH" (Path.toString p) in
+  let cooked = Util.replacesubstring cooked "PATH"
+		(Uutil.quotes (Path.toString p)) in
   cooked
     
 let copyBack fspathFrom pathFrom rootTo pathTo propsTo uiTo id =

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2012-02-26 12:56:45 UTC (rev 482)
+++ trunk/src/mkProjectInfo.ml	2012-02-26 21:01:47 UTC (rev 483)
@@ -63,3 +63,4 @@
 
 
 
+