From bcpierce at seas.upenn.edu Sun Nov 1 20:35:19 2015 From: bcpierce at seas.upenn.edu (bcpierce at seas.upenn.edu) Date: Sun, 1 Nov 2015 20:35:19 -0500 Subject: [Unison-hackers] [unison-svn] r549 - trunk/src Message-ID: <201511020135.tA21ZJ0r009953@yaws.seas.upenn.edu> Author: bcpierce Date: 2015-11-01 20:35:17 -0500 (Sun, 01 Nov 2015) New Revision: 549 Modified: trunk/src/RECENTNEWS trunk/src/files.ml trunk/src/mkProjectInfo.ml Log: * Remove colon from names of files created by the -copyonconflict flag, to avoid unhappiness with some filesystems. Modified: trunk/src/RECENTNEWS =================================================================== --- trunk/src/RECENTNEWS 2015-10-05 18:14:23 UTC (rev 548) +++ trunk/src/RECENTNEWS 2015-11-02 01:35:17 UTC (rev 549) @@ -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 Modified: trunk/src/files.ml =================================================================== --- trunk/src/files.ml 2015-10-05 18:14:23 UTC (rev 548) +++ trunk/src/files.ml 2015-11-02 01:35:17 UTC (rev 549) @@ -96,7 +96,7 @@ 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 Modified: trunk/src/mkProjectInfo.ml =================================================================== --- trunk/src/mkProjectInfo.ml 2015-10-05 18:14:23 UTC (rev 548) +++ trunk/src/mkProjectInfo.ml 2015-11-02 01:35:17 UTC (rev 549) @@ -106,3 +106,4 @@ +