[Unison-hackers] [unison-svn] r274 - in trunk: . doc src

[Benjamin C. Pierce]

Author: bcpierce
Date: 2008-04-29 10:07:12 -0400 (Tue, 29 Apr 2008)
New Revision: 274

Added:
   trunk/.depend
Modified:
   trunk/Makefile
   trunk/doc/unison-manual.tex
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
   trunk/src/uicommon.ml
   trunk/src/update.ml
Log:
* Transfer changes from 2.27 branch


Added: trunk/.depend
===================================================================
--- trunk/.depend	                        (rev 0)
+++ trunk/.depend	2008-04-29 14:07:12 UTC (rev 274)
@@ -0,0 +1,70 @@
+src/abort.cmo: src/abort.cmi 
+src/abort.cmx: src/abort.cmi 
+src/case.cmo: src/case.cmi 
+src/case.cmx: src/case.cmi 
+src/checksum.cmo: src/checksum.cmi 
+src/checksum.cmx: src/checksum.cmi 
+src/clroot.cmo: src/clroot.cmi 
+src/clroot.cmx: src/clroot.cmi 
+src/common.cmo: src/common.cmi 
+src/common.cmx: src/common.cmi 
+src/copy.cmo: src/copy.cmi 
+src/copy.cmx: src/copy.cmi 
+src/fileinfo.cmo: src/fileinfo.cmi 
+src/fileinfo.cmx: src/fileinfo.cmi 
+src/files.cmo: src/files.cmi 
+src/files.cmx: src/files.cmi 
+src/fileutil.cmo: src/fileutil.cmi 
+src/fileutil.cmx: src/fileutil.cmi 
+src/fingerprint.cmo: src/fingerprint.cmi 
+src/fingerprint.cmx: src/fingerprint.cmi 
+src/fspath.cmo: src/fspath.cmi 
+src/fspath.cmx: src/fspath.cmi 
+src/globals.cmo: src/globals.cmi 
+src/globals.cmx: src/globals.cmi 
+src/lock.cmo: src/lock.cmi 
+src/lock.cmx: src/lock.cmi 
+src/name.cmo: src/name.cmi 
+src/name.cmx: src/name.cmi 
+src/os.cmo: src/os.cmi 
+src/os.cmx: src/os.cmi 
+src/osx.cmo: src/osx.cmi 
+src/osx.cmx: src/osx.cmi 
+src/path.cmo: src/path.cmi 
+src/path.cmx: src/path.cmi 
+src/pred.cmo: src/pred.cmi 
+src/pred.cmx: src/pred.cmi 
+src/props.cmo: src/props.cmi 
+src/props.cmx: src/props.cmi 
+src/recon.cmo: src/recon.cmi 
+src/recon.cmx: src/recon.cmi 
+src/remote.cmo: src/remote.cmi 
+src/remote.cmx: src/remote.cmi 
+src/sortri.cmo: src/sortri.cmi 
+src/sortri.cmx: src/sortri.cmi 
+src/stasher.cmo: src/stasher.cmi 
+src/stasher.cmx: src/stasher.cmi 
+src/strings.cmo: src/strings.cmi 
+src/strings.cmx: src/strings.cmi 
+src/terminal.cmo: src/terminal.cmi 
+src/terminal.cmx: src/terminal.cmi 
+src/transfer.cmo: src/transfer.cmi 
+src/transfer.cmx: src/transfer.cmi 
+src/transport.cmo: src/transport.cmi 
+src/transport.cmx: src/transport.cmi 
+src/tree.cmo: src/tree.cmi 
+src/tree.cmx: src/tree.cmi 
+src/uicommon.cmo: src/uicommon.cmi 
+src/uicommon.cmx: src/uicommon.cmi 
+src/uigtk2.cmo: src/uigtk2.cmi 
+src/uigtk2.cmx: src/uigtk2.cmi 
+src/uigtk.cmo: src/uigtk.cmi 
+src/uigtk.cmx: src/uigtk.cmi 
+src/uitext.cmo: src/uitext.cmi 
+src/uitext.cmx: src/uitext.cmi 
+src/update.cmo: src/update.cmi 
+src/update.cmx: src/update.cmi 
+src/uutil.cmo: src/uutil.cmi 
+src/uutil.cmx: src/uutil.cmi 
+src/xferhint.cmo: src/xferhint.cmi 
+src/xferhint.cmx: src/xferhint.cmi 

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2008-03-29 16:40:01 UTC (rev 273)
+++ trunk/Makefile	2008-04-29 14:07:12 UTC (rev 274)
@@ -42,6 +42,19 @@
 	-cat src/RECENTNEWS >> rc.tmp
 	mv -f rc.tmp src/RECENTNEWS
 
+DUPCMD = svn merge -r prev:committed ../branches/2.27
+
+dup:
+	@echo "Make sure changes have been committed in the 2.27 branch!"
+	$(DUPCMD) --dry-run 
+	@echo "Note that there may be conflicts on some silly files "
+	@echo "  (not sure how to avoid merging those changes!) "
+	@echo -n "Press RETURN to really do it... "
+	@read JUNK
+	$(DUPCMD)
+	echo >> logmsg
+	echo "* Transfer changes from 2.27 branch" >> logmsg
+
 ######################################################################
 # Export
 
@@ -201,7 +214,7 @@
 nightly:
 	($(RM) -r $(HOME)/tmp/unison; \
          cd $(HOME)/tmp; \
-	 svn co https://svn.cis.upenn.edu/svnroot/unison/trunk unison; \
+	 svn co https://webdav.seas.upenn.edu/svn/unison/trunk unison; \
          cd $(HOME)/tmp/unison; \
          $(MAKE) exportdevel)
 
@@ -273,9 +286,3 @@
 src/$(NAME):
 	$(MAKE) -C src
 
-bcpgrab:
-	-unison eniac -path current/unison/trunk -batch
-	ssh central-l.cis.upenn.edu "(cd current/unison/trunk; svn update)"
-	-unison eniac -path current/unison/trunk -batch
-	make
-

Modified: trunk/doc/unison-manual.tex
===================================================================
--- trunk/doc/unison-manual.tex	2008-03-29 16:40:01 UTC (rev 273)
+++ trunk/doc/unison-manual.tex	2008-04-29 14:07:12 UTC (rev 274)
@@ -1678,7 +1678,8 @@
 A large number of external merging programs are available.  
 For example, on Unix systems setting the \verb|merge| preference to
 \begin{verbatim}
-    merge = Name *.txt -> diff3 CURRENT1 CURRENTARCH CURRENT2 -m > NEW
+    merge = Name *.txt -> diff3 -m CURRENT1 CURRENTARCH CURRENT2
+                            > NEW || echo "differences detected"
 \end{verbatim}
 \noindent
 will tell Unison to use the external \verb|diff3| program for merging.  

Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2008-03-29 16:40:01 UTC (rev 273)
+++ trunk/src/RECENTNEWS	2008-04-29 14:07:12 UTC (rev 274)
@@ -1,4 +1,9 @@
+CHANGES FROM VERSION 2.28.36
+
+* Transfer changes from 2.27 branch
+
 -------------------------------
+-------------------------------
 CHANGES FROM VERSION 2.28.29
 
 * Propagage changes from 2.27 branch.

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2008-03-29 16:40:01 UTC (rev 273)
+++ trunk/src/mkProjectInfo.ml	2008-04-29 14:07:12 UTC (rev 274)
@@ -66,3 +66,4 @@
 
 
 
+

Modified: trunk/src/uicommon.ml
===================================================================
--- trunk/src/uicommon.ml	2008-03-29 16:40:01 UTC (rev 273)
+++ trunk/src/uicommon.ml	2008-04-29 14:07:12 UTC (rev 274)
@@ -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))

Modified: trunk/src/update.ml
===================================================================
--- trunk/src/update.ml	2008-03-29 16:40:01 UTC (rev 273)
+++ trunk/src/update.ml	2008-04-29 14:07:12 UTC (rev 274)
@@ -973,7 +973,7 @@
 
 let immutable = Pred.create "immutable"
    ("This preference specifies paths for directories whose \
-     children are all immutable files --- i.e., once a file has been \
+     immediate children are all immutable files --- i.e., once a file has been \
      created, its contents never changes.  When scanning for updates, \
      Unison does not check whether these files have been modified; \
      this can speed update detection significantly (in particular, for mail \