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

[bcpierce at seas.upenn.edu]

Author: bcpierce
Date: 2015-12-01 15:49:45 -0500 (Tue, 01 Dec 2015)
New Revision: 550

Modified:
   trunk/src/RECENTNEWS
   trunk/src/files.ml
   trunk/src/mkProjectInfo.ml
Log:
* Small fix to gtk2 UI per suggestion from Daniel Reichelt, to scan
  profiles before main window is created.

* Small fix to avoid assertion failure on conflicts involving deleted
  files when using -copyonconflict flag



Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2015-11-02 01:35:17 UTC (rev 549)
+++ trunk/src/RECENTNEWS	2015-12-01 20:49:45 UTC (rev 550)
@@ -1,3 +1,13 @@
+CHANGES FROM VERSION 2.49.6
+
+* Small fix to gtk2 UI per suggestion from Daniel Reichelt, to scan
+  profiles before main window is created.
+
+* Small fix to avoid assertion failure on conflicts involving deleted
+  files when using -copyonconflict flag
+
+
+-------------------------------
 CHANGES FROM VERSION 2.49.4
 
 * Remove colon from names of files created by the -copyonconflict

Modified: trunk/src/files.ml
===================================================================
--- trunk/src/files.ml	2015-11-02 01:35:17 UTC (rev 549)
+++ trunk/src/files.ml	2015-12-01 20:49:45 UTC (rev 550)
@@ -82,7 +82,10 @@
    with the \\verb|-repeat watch| and \\verb|-prefer newer| preferences."
 
 let prepareCopy workingDir path notDefault =
-  if notDefault && Prefs.read copyOnConflict then begin
+  if notDefault
+     && Prefs.read copyOnConflict
+     && (Fileinfo.get true workingDir path).Fileinfo.typ <> `ABSENT
+  then begin
     let tmpPath = Os.tempPath workingDir path in
     Copy.recursively workingDir path workingDir tmpPath;
     Some (workingDir, path, tmpPath)

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2015-11-02 01:35:17 UTC (rev 549)
+++ trunk/src/mkProjectInfo.ml	2015-12-01 20:49:45 UTC (rev 550)
@@ -107,3 +107,4 @@
 
 
 
+