diff options
| author | Benjamin C. Pierce <bcpierce@cis.upenn.edu> | 2015-11-02 01:35:17 +0000 |
|---|---|---|
| committer | Benjamin C. Pierce <bcpierce@cis.upenn.edu> | 2015-11-02 01:35:17 +0000 |
| commit | fd18ed82c978f5f989d76944aa17f39996bb5018 (patch) | |
| tree | 6284f0eb169d4d2719ea71cb53db604b3361c632 | |
| parent | 02175cdb12c544af792ef75447e05ad609fa1801 (diff) | |
| download | unison-fd18ed82c978f5f989d76944aa17f39996bb5018.zip unison-fd18ed82c978f5f989d76944aa17f39996bb5018.tar.gz unison-fd18ed82c978f5f989d76944aa17f39996bb5018.tar.bz2 | |
* Remove colon from names of files created by the -copyonconflict
flag, to avoid unhappiness with some filesystems.
| -rw-r--r-- | src/RECENTNEWS | 5 | ||||
| -rw-r--r-- | src/files.ml | 2 | ||||
| -rw-r--r-- | src/mkProjectInfo.ml | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/RECENTNEWS b/src/RECENTNEWS index b7dc1db..7d720fd 100644 --- a/src/RECENTNEWS +++ b/src/RECENTNEWS @@ -1,3 +1,8 @@ +CHANGES FROM VERSION 2.49.4 + +* Remove colon from names of files created by the -copyonconflict + flag, to avoid unhappiness with some filesystems. +------------------------------- CHANGES FROM VERSION 2.49.3 uimac14: install the command-line tool in /usr/local/bin diff --git a/src/files.ml b/src/files.ml index 0fde024..af456ef 100644 --- a/src/files.ml +++ b/src/files.ml @@ -96,7 +96,7 @@ let finishCopy copyInfo = let rec copyPath n = let p = Path.addToFinalName path - (Format.sprintf " (copy: conflict%s on %04d-%02d-%02d)" + (Format.sprintf " (conflict%s on %04d-%02d-%02d)" (if n = 0 then "" else " #" ^ string_of_int n) (tm.Unix.tm_year + 1900) (tm.Unix.tm_mon + 1) tm.Unix.tm_mday) in diff --git a/src/mkProjectInfo.ml b/src/mkProjectInfo.ml index 22161a7..0050cc9 100644 --- a/src/mkProjectInfo.ml +++ b/src/mkProjectInfo.ml @@ -106,3 +106,4 @@ Printf.printf "NAME=%s\n" projectName;; + |