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

[subversion@central.cis.upenn.edu]

Author: lescuyer
Date: 2005-07-22 21:03:52 -0400 (Fri, 22 Jul 2005)
New Revision: 93

Modified:
   trunk/.depend
   trunk/doc/unison-manual.tex
   trunk/src/.depend
   trunk/src/files.ml
   trunk/src/files.mli
   trunk/src/strings.ml
   trunk/src/transport.mli
   trunk/src/uicommon.ml
   trunk/src/uicommon.mli
   trunk/src/uigtk.ml
   trunk/src/uigtk2.ml
   trunk/src/uimacbridge.ml
   trunk/src/uitext.ml
Log:
* Merge will not be committed as soon as the merge function returns
  non-zero, even if the files have been changed to an equal state.
* Standard output and standard error of the merge command are both
  captured for the log. 
* Would the merge return with non-zero, then the user has access to
  this output through a new button in the details frame at the bottom
  of the main window.
* Added a confirmmerge preference. If set, the user is being asked for
  confirmation before checking the results of a merge into the
  replicas, unless Unison is running in batch mode. In text mode, the
  whole output of the merge function is printed and then the user is
  asked for yes or no; in ui-mode, a simple Yes/No dialog is used, and
  the user can check the output of the merge cmd through another
  button (it's usually to big to fit in w dialog).
* Edited the manual to reflect these changes.