diff options
| author | Alan Schmitt <alan.schmitt@polytechnique.org> | 2012-02-26 21:01:47 +0000 |
|---|---|---|
| committer | Alan Schmitt <alan.schmitt@polytechnique.org> | 2012-02-26 21:01:47 +0000 |
| commit | 6297cc28b507ad33e79217c802c41cf1d830c4db (patch) | |
| tree | ccde897adcf4c9fff2b5c24e77718a792cecc5ca | |
| parent | 5253ba17ce431958f562927745809797c70f1f89 (diff) | |
| download | unison-6297cc28b507ad33e79217c802c41cf1d830c4db.zip unison-6297cc28b507ad33e79217c802c41cf1d830c4db.tar.gz unison-6297cc28b507ad33e79217c802c41cf1d830c4db.tar.bz2 | |
* Correctly quote the path when running merge commands
| -rw-r--r-- | src/RECENTNEWS | 5 | ||||
| -rw-r--r-- | src/files.ml | 3 | ||||
| -rw-r--r-- | src/mkProjectInfo.ml | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/RECENTNEWS b/src/RECENTNEWS index e698474..09aae74 100644 --- a/src/RECENTNEWS +++ b/src/RECENTNEWS @@ -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 diff --git a/src/files.ml b/src/files.ml index 62cf3ed..1d1bfc9 100644 --- a/src/files.ml +++ b/src/files.ml @@ -733,7 +733,8 @@ let formatMergeCmd p f1 f2 backup out1 out2 outarch = 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 = diff --git a/src/mkProjectInfo.ml b/src/mkProjectInfo.ml index 0f683de..2037d51 100644 --- a/src/mkProjectInfo.ml +++ b/src/mkProjectInfo.ml @@ -63,3 +63,4 @@ Printf.printf "NAME=%s\n" projectName;; + |