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

[Benjamin C. Pierce]

Author: bcpierce
Date: 2008-07-03 13:42:21 -0400 (Thu, 03 Jul 2008)
New Revision: 303

Modified:
   trunk/src/RECENTNEWS
   trunk/src/copy.ml
   trunk/src/mkProjectInfo.ml
Log:
* Fixed a small bug with resuming interrupted file transfers when both
  replicas are local.

Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2008-07-02 14:06:09 UTC (rev 302)
+++ trunk/src/RECENTNEWS	2008-07-03 17:42:21 UTC (rev 303)
@@ -1,3 +1,8 @@
+CHANGES FROM VERSION 2.31.1
+
+* Fixed a small bug with resuming interrupted file transfers when both
+  replicas are local.
+-------------------------------
 CHANGES FROM VERSION 2.31.-1
 
 * Fixed a couple of file-transfer bugs.  (One was about copying

Modified: trunk/src/copy.ml
===================================================================
--- trunk/src/copy.ml	2008-07-02 14:06:09 UTC (rev 302)
+++ trunk/src/copy.ml	2008-07-03 17:42:21 UTC (rev 303)
@@ -72,6 +72,7 @@
           (Fspath.toString fspathTo) (Path.toString pathTo));
       let inFd = openFileIn fspathFrom pathFrom `DATA in
       protect (fun () ->
+        Os.delete fspathTo pathTo;
         let outFd = openFileOut fspathTo pathTo `DATA in
         protect (fun () ->
           Uutil.readWrite inFd outFd

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2008-07-02 14:06:09 UTC (rev 302)
+++ trunk/src/mkProjectInfo.ml	2008-07-03 17:42:21 UTC (rev 303)
@@ -87,3 +87,4 @@
 
 
 
+