[Unison-hackers] [unison-svn] r270 - branches/2.27/src

[Benjamin C. Pierce]

Author: bcpierce
Date: 2008-02-18 08:24:55 -0500 (Mon, 18 Feb 2008)
New Revision: 270

Modified:
   branches/2.27/src/RECENTNEWS
   branches/2.27/src/mkProjectInfo.ml
   branches/2.27/src/uicommon.ml
Log:
* Add a note to the 'some path has been completely deleted' warning
  telling users to use 'confirmbigdeletes' to turn it off.


Modified: branches/2.27/src/RECENTNEWS
===================================================================
--- branches/2.27/src/RECENTNEWS	2008-02-15 02:52:28 UTC (rev 269)
+++ branches/2.27/src/RECENTNEWS	2008-02-18 13:24:55 UTC (rev 270)
@@ -0,0 +1,6 @@
+CHANGES FROM VERSION 2.27.57
+
+* Add a note to the 'some path has been completely deleted' warning
+  telling users to use 'confirmbigdeletes' to turn it off.
+
+-------------------------------

Modified: branches/2.27/src/mkProjectInfo.ml
===================================================================
--- branches/2.27/src/mkProjectInfo.ml	2008-02-15 02:52:28 UTC (rev 269)
+++ branches/2.27/src/mkProjectInfo.ml	2008-02-18 13:24:55 UTC (rev 270)
@@ -69,3 +69,4 @@
 
 
 
+

Modified: branches/2.27/src/uicommon.ml
===================================================================
--- branches/2.27/src/uicommon.ml	2008-02-15 02:52:28 UTC (rev 269)
+++ branches/2.27/src/uicommon.ml	2008-02-18 13:24:55 UTC (rev 270)
@@ -322,12 +322,14 @@
 let dangerousPathMsg dangerousPaths =
   if dangerousPaths = [Path.empty] then
     "The root of one of the replicas has been completely emptied.\n\
-     Unison may delete everything in the other replica."
+     Unison may delete everything in the other replica.  (Set the \n\
+     'confirmbigdelete' preference to false to disable this check.)"
   else
     Printf.sprintf
       "The following paths have been completely emptied in one replica:\n  \
        %s\n\
-       Unison may delete everything below these paths in the other replica."
+       Unison may delete everything below these paths in the other replica.\n
+       (Set the 'confirmbigdelete' preference to false to disable this check.)"
       (String.concat "\n  "
          (Safelist.map (fun p -> "'" ^ (Path.toString p) ^ "'")
             dangerousPaths))