[Unison-hackers] [unison-svn] r537 - in branches/2.40: doc src src/ubase
bcpierce at seas.upenn.edu
bcpierce at seas.upenn.edu
Mon Dec 29 21:21:28 EST 2014
Author: bcpierce
Date: 2014-12-29 21:21:28 -0500 (Mon, 29 Dec 2014)
New Revision: 537
Removed:
branches/2.40/src/ubase/uprintf.ml
branches/2.40/src/ubase/uprintf.mli
Modified:
branches/2.40/doc/docs.ml
branches/2.40/src/Makefile.OCaml
branches/2.40/src/NEWS
branches/2.40/src/RECENTNEWS
branches/2.40/src/mkProjectInfo.ml
branches/2.40/src/strings.ml
branches/2.40/src/ubase/Makefile
branches/2.40/src/ubase/depend
branches/2.40/src/ubase/util.ml
Log:
* Backport fix for OCaml 4 to stable version (2.40)
Modified: branches/2.40/doc/docs.ml
===================================================================
--- branches/2.40/doc/docs.ml 2014-12-29 18:34:45 UTC (rev 536)
+++ branches/2.40/doc/docs.ml 2014-12-30 02:21:28 UTC (rev 537)
@@ -20,10 +20,12 @@
let prsection ch =
let name = input_line ch in
let shortname = input_line ch in
- let empty = input_line ch in
- if empty<>"" then
- (fprintf stderr "Second line after SNIP is '%s', not empty!\n" empty;
- exit 1);
+ if shortname <> "" then begin
+ let empty = input_line ch in
+ if empty<>"" then
+ (fprintf stderr "Second line after SNIP is '%s', not empty!\n" empty;
+ exit 1)
+ end;
fprintf ml " (\"%s\", (\"%s\", \n \"" shortname name;
let rec loop () =
let l = input_line ch in
Modified: branches/2.40/src/Makefile.OCaml
===================================================================
--- branches/2.40/src/Makefile.OCaml 2014-12-29 18:34:45 UTC (rev 536)
+++ branches/2.40/src/Makefile.OCaml 2014-12-30 02:21:28 UTC (rev 537)
@@ -211,7 +211,7 @@
system.cmo \
\
ubase/projectInfo.cmo ubase/myMap.cmo ubase/safelist.cmo \
- ubase/uprintf.cmo ubase/util.cmo ubase/uarg.cmo \
+ ubase/util.cmo ubase/uarg.cmo \
ubase/prefs.cmo ubase/trace.cmo ubase/proplist.cmo \
\
lwt/pqueue.cmo lwt/lwt.cmo lwt/lwt_util.cmo \
Modified: branches/2.40/src/NEWS
===================================================================
--- branches/2.40/src/NEWS 2014-12-29 18:34:45 UTC (rev 536)
+++ branches/2.40/src/NEWS 2014-12-30 02:21:28 UTC (rev 537)
@@ -1,5 +1,5 @@
-Changes in Version 2.40.65
+Changes in Version 2.40.102
Changes since 2.40.1:
* Added "BelowPath" patterns, that match a path as well as all paths
@@ -7,42 +7,42 @@
preferences)
* Added a "fat" preference that makes Unison use the right options
when one of the replica is on a FAT filesystem.
- * Allow "prefer/force=newer" even when not synchronizing
- modification times. (The reconciler will not be aware of the
- modification time of unchanged files, so the synchronization
- choices of Unison can be different from when "times=true", but the
- behavior remains sane: changed files with the most recent
- modification time will be propagated.)
+ * Allow "prefer/force=newer" even when not synchronizing modification
+ times. (The reconciler will not be aware of the modification time
+ of unchanged files, so the synchronization choices of Unison can be
+ different from when "times=true", but the behavior remains sane:
+ changed files with the most recent modification time will be
+ propagated.)
* Minor fixes and improvements:
+ Compare filenames up to decomposition in case sensitive mode
when one host is running MacOSX and the unicode preference is
set to true.
+ Rsync: somewhat faster compressor
- + Make Unicode the default on all architectures (it was only
- the default when a Mac OS X or Windows machine was involved).
+ + Make Unicode the default on all architectures (it was only the
+ default when a Mac OS X or Windows machine was involved).
Changes since 2.32:
* Major enhancement: Unicode support.
+ Unison should now handle unicode filenames correctly on all
platforms.
+ This functionality is controlled by a new preference unicode.
- + Unicode mode is now the default when one of the hosts is
- under Windows or MacOS. This may make upgrades a bit more
- painful (the archives cannot be reused), but this is a much
- saner default.
+ + Unicode mode is now the default when one of the hosts is under
+ Windows or MacOS. This may make upgrades a bit more painful
+ (the archives cannot be reused), but this is a much saner
+ default.
* Partial transfer of directories. If an error occurs while
transferring a directory, the part transferred so far is copied
into place (and the archives are updated accordingly). The
- "maxerrors" preference controls how many transfer error Unison
- will accept before stopping the transfer of a directory (by
- default, only one). This makes it possible to transfer most of a
- directory even if there are some errors. Currently, only the first
- error is reported by the GUIs.
- Also, allow partial transfer of a directory when there was an
- error deep inside this directory during update detection. At the
- moment, this is only activated with the text and GTK UIs, which
- have been modified so that they show that the transfer is going to
- be partial and so that they can display all errors.
+ "maxerrors" preference controls how many transfer error Unison will
+ accept before stopping the transfer of a directory (by default,
+ only one). This makes it possible to transfer most of a directory
+ even if there are some errors. Currently, only the first error is
+ reported by the GUIs.
+ Also, allow partial transfer of a directory when there was an error
+ deep inside this directory during update detection. At the moment,
+ this is only activated with the text and GTK UIs, which have been
+ modified so that they show that the transfer is going to be partial
+ and so that they can display all errors.
* Improvement to the code for resuming directory transfers:
+ if a file was not correctly transferred (or the source has
been modified since, with unchanged size), Unison performs a
@@ -51,8 +51,8 @@
deleted on the source replica before resuming the transfer;
not deleting the file would result in it reappearing on the
target replica)
- * Experimental streaming protocol for transferring file contents
- (can be disabled by setting the directive "stream" to false): file
+ * Experimental streaming protocol for transferring file contents (can
+ be disabled by setting the directive "stream" to false): file
contents is transfered asynchronously (without waiting for a
response from the destination after each chunk sent) rather than
using the synchronous RPC mechanism. As a consequence:
@@ -62,9 +62,9 @@
+ the transfer of large files uses the full available bandwidth
and is not slowed done due to the connection latency anymore
+ we get performance improvement for small files as well by
- scheduling many files simultaneously (as scheduling a file
- for transfer consume little ressource: it does not mean
- allocating a large buffer anymore)
+ scheduling many files simultaneously (as scheduling a file for
+ transfer consume little ressource: it does not mean allocating
+ a large buffer anymore)
* Changes to the internal implementation of the rsync algorithm:
+ use longer blocks for large files (the size of a block is the
square root of the size of the file for large files);
@@ -100,29 +100,29 @@
efficient alternative to "maxthreads = 1").
* Renamed preference "pretendwin" to "ignoreinodenumbers" (an alias
is kept for backwards compatibility).
- * Ignore one-second differences when synchronizing modification
- time. (Technically, this is an incompatible archive format change,
- but it is backward compatible. To trigger a problem, a user would
- have to synchronize modification times on a filesystem with a
- two-second granularity and then downgrade to a previous version of
- Unison, which does not work well in such a case. Thus, it does not
- seem worthwhile to increment the archive format number, which
- would impact all users.)
- * Do not keep many files simultaneously opened anymore when the
- rsync algorithm is in use.
+ * Ignore one-second differences when synchronizing modification time.
+ (Technically, this is an incompatible archive format change, but it
+ is backward compatible. To trigger a problem, a user would have to
+ synchronize modification times on a filesystem with a two-second
+ granularity and then downgrade to a previous version of Unison,
+ which does not work well in such a case. Thus, it does not seem
+ worthwhile to increment the archive format number, which would
+ impact all users.)
+ * Do not keep many files simultaneously opened anymore when the rsync
+ algorithm is in use.
* Add "ignorearchives" preference to ignore existing archives (to
avoid forcing users to delete them manually, in situations where
one archive has gotten deleted or corrupted).
* Mac OS
- + fixed rsync bug which could result in an "index out of
- bounds" error when transferring resource forks.
+ + fixed rsync bug which could result in an "index out of bounds"
+ error when transferring resource forks.
+ Fixed bug which made Unison ignore finder information and
resource fork when compiled to 64bit on Mac OSX.
+ should now be 64 bit clean (the Growl framework is not up to
date, though)
- + Made the bridge between Objective C and Ocaml code GC
- friendly (it was allocating ML values and putting them in an
- array which was not registered with the GC)
+ + Made the bridge between Objective C and Ocaml code GC friendly
+ (it was allocating ML values and putting them in an array
+ which was not registered with the GC)
+ use darker grey arrows (patch contributed by Eric Y. Kow)
* GTK user interface
+ assistant for creating profiles
@@ -145,8 +145,8 @@
+ Do not display "Looking for change" messages during
propagation (when checking the targe is unchanged) but only
during update detection
- + Apply patch to fix some crashes in the OSX GUI, thanks to
- Onne Gorter.
+ + Apply patch to fix some crashes in the OSX GUI, thanks to Onne
+ Gorter.
* Text UI
+ During update detection, display status by updating a single
line rather than generating a new line of output every so
@@ -160,23 +160,23 @@
+ Windows text UI: now put the console into UTF-8 output mode.
This is the right thing to do when in Unicode mode, and is no
worse than what we had previously otherwise (the console use
- some esoteric encoding by default). This only works when
- using a Unicode font instead of the default raster font.
+ some esoteric encoding by default). This only works when using
+ a Unicode font instead of the default raster font.
+ Don't get the home directory from environment variable HOME
under Windows (except for Cygwin binaries): we don't want the
behavior of Unison to depends on whether it is run from a
Cygwin shell (where HOME is set) or in any other way (where
HOME is usually not set).
* Miscellaneous fixes and improvements
- + Made a server waiting on a socket more resilient to
- unexpected lost connections from the client.
+ + Made a server waiting on a socket more resilient to unexpected
+ lost connections from the client.
+ Small patch to property setting code suggested by Ulrich
Gernkow.
+ Several fixes to the change transfer functions (both the
internal ones and external transfers using rsync). In
- particular, limit the number of simultaneous transfer using
- an rsync (as the rsync algorithm can use a large amount of
- memory when processing huge files)
+ particular, limit the number of simultaneous transfer using an
+ rsync (as the rsync algorithm can use a large amount of memory
+ when processing huge files)
+ Keep track of which file contents are being transferred, and
delay the transfer of a file when another file with the same
contents is currently being transferred. This way, the second
@@ -187,12 +187,12 @@
on the next sync.
+ Fixed bug with case insensitive mode on a case sensitive
filesystem:
- o if file "a/a" is created on one replica and directory
- "A" is created on the other, the file failed to be
+ o if file "a/a" is created on one replica and directory "A"
+ is created on the other, the file failed to be
synchronized the first time Unison is run afterwards, as
- Unison uses the wrong path "a/a" (if Unison is run
- again, the directories are in the archive, so the right
- path is used);
+ Unison uses the wrong path "a/a" (if Unison is run again,
+ the directories are in the archive, so the right path is
+ used);
o if file "a" appears on one replica and file "A" appears
on the other with different contents, Unison was unable
to synchronize them.
@@ -200,9 +200,8 @@
during synchronization: Unison now tells which file has been
updated, and how.
+ Limit the length of temporary file names
- + Case sensitivity information put in the archive (in a
- backward compatible way) and checked when the archive is
- loaded
+ + Case sensitivity information put in the archive (in a backward
+ compatible way) and checked when the archive is loaded
+ Got rid of the 16mb marshalling limit by marshalling to a
bigarray.
+ Resume copy of partially transferred files.
@@ -210,8 +209,8 @@
Changes since 2.31:
* Small user interface changes
+ Small change to text UI "scanning..." messages, to print just
- directories (hopefully making it clearer that individual
- files are not necessarily being fingerprinted).
+ directories (hopefully making it clearer that individual files
+ are not necessarily being fingerprinted).
* Minor fixes and improvements:
+ Ignore one hour differences when deciding whether a file may
have been updated. This avoids slow update detection after
@@ -220,15 +219,15 @@
enough.
+ Fix a small bug that was affecting mainly windows users. We
need to commit the archives at the end of the sync even if
- there are no updates to propagate because some files (in
- fact, if we've just switched to DST on windows, a LOT of
- files) might have new modtimes in the archive. (Changed the
- text UI only. It's less clear where to change the GUI.)
+ there are no updates to propagate because some files (in fact,
+ if we've just switched to DST on windows, a LOT of files)
+ might have new modtimes in the archive. (Changed the text UI
+ only. It's less clear where to change the GUI.)
+ Don't delete the temp file when a transfer fails due to a
- fingerprint mismatch (so that we can have a look and see
- why!) We've also added more debugging code togive more
- informative error messages when we encounter the dreaded and
- longstanding "assert failed during file transfer" bug
+ fingerprint mismatch (so that we can have a look and see why!)
+ We've also added more debugging code togive more informative
+ error messages when we encounter the dreaded and longstanding
+ "assert failed during file transfer" bug
+ Incorrect paths ("path" directive) now result in an error
update item rather than a fatal error.
+ Create parent directories (with correct permissions) during
@@ -248,53 +247,51 @@
transfer protocol. Three new preferences have been added:
+ copyprog is a string giving the name (and command-line
switches, if needed) of an external program that can be used
- to copy large files efficiently. By default, rsync is
- invoked, but other tools such as scp can be used instead by
- changing the value of this preference. (Although this is not
- its primary purpose, rsync is actually a pretty fast way of
- copying files that don't already exist on the receiving
- host.) For files that do already exist on (but that have been
- changed in one replica), Unison will always use its built-in
+ to copy large files efficiently. By default, rsync is invoked,
+ but other tools such as scp can be used instead by changing
+ the value of this preference. (Although this is not its
+ primary purpose, rsync is actually a pretty fast way of
+ copying files that don't already exist on the receiving host.)
+ For files that do already exist on (but that have been changed
+ in one replica), Unison will always use its built-in
implementation of the rsync algorithm.
+ Added a "copyprogrest" preference, so that we can give
- different command lines for invoking the external copy
- utility depending on whether a partially transferred file
- already exists or not. (Rsync doesn't seem to care about
- this, but other utilities may.)
+ different command lines for invoking the external copy utility
+ depending on whether a partially transferred file already
+ exists or not. (Rsync doesn't seem to care about this, but
+ other utilities may.)
+ copythreshold is an integer (-1 by default), indicating above
what filesize (in megabytes) Unison should use the external
- copying utility specified by copyprog. Specifying 0 will
- cause ALL copies to use the external program; a negative
- number will prevent any files from using it. (Default is -1.)
+ copying utility specified by copyprog. Specifying 0 will cause
+ ALL copies to use the external program; a negative number will
+ prevent any files from using it. (Default is -1.)
Thanks to Alan Schmitt for a huge amount of hacking and to an
anonymous sponsor for suggesting and underwriting this extension.
* Small improvements:
- + Added a new preference, dontchmod. By default, Unison uses
- the chmod system call to set the permission bits of files
- after it has copied them. But in some circumstances (and
- under some operating systems), the chmod call always fails.
- Setting this preference completely prevents Unison from ever
- calling chmod.
+ + Added a new preference, dontchmod. By default, Unison uses the
+ chmod system call to set the permission bits of files after it
+ has copied them. But in some circumstances (and under some
+ operating systems), the chmod call always fails. Setting this
+ preference completely prevents Unison from ever calling chmod.
+ Don't ignore files that look like backup files if the
backuplocation preference is set to central
+ Shortened the names of several preferences. The old names are
- also still supported, for backwards compatibility, but they
- do not appear in the documentation.
+ also still supported, for backwards compatibility, but they do
+ not appear in the documentation.
+ Lots of little documentation tidying. (In particular,
- preferences are separated into Basic and Advanced! This
- should hopefully make Unison a little more approachable for
- new users.
+ preferences are separated into Basic and Advanced! This should
+ hopefully make Unison a little more approachable for new
+ users.
+ Unison can sometimes fail to transfer a file, giving the
- unhelpful message "Destination updated during
- synchronization" even though the file has not been changed.
- This can be caused by programs that change either the file's
- contents or the file's extended attributes without changing
- its modification time. It's not clear what is the best fix
- for this - it is not Unison's fault, but it makes Unison's
- behavior puzzling - but at least Unison can be more helpful
- about suggesting a workaround (running once with fastcheck
- set to false). The failure message has been changed to give
- this advice.
+ unhelpful message "Destination updated during synchronization"
+ even though the file has not been changed. This can be caused
+ by programs that change either the file's contents or the
+ file's extended attributes without changing its modification
+ time. It's not clear what is the best fix for this - it is not
+ Unison's fault, but it makes Unison's behavior puzzling - but
+ at least Unison can be more helpful about suggesting a
+ workaround (running once with fastcheck set to false). The
+ failure message has been changed to give this advice.
+ Further improvements to the OS X GUI (thanks to Alan Schmitt
and Craig Federighi).
* Very preliminary support for triggering Unison from an external
@@ -308,33 +305,32 @@
+ start Unison with the command-line flag "-repeat FOO", where
FOO is name of a file where Unison should look for
notifications of changes
- + when it starts up, Unison will read the whole contents of
- this file (on both hosts), which should be a
- newline-separated list of paths (relative to the root of the
- synchronization) and synchronize just these paths, as if it
- had been started with the "-path=xxx" option for each one of
- them
+ + when it starts up, Unison will read the whole contents of this
+ file (on both hosts), which should be a newline-separated list
+ of paths (relative to the root of the synchronization) and
+ synchronize just these paths, as if it had been started with
+ the "-path=xxx" option for each one of them
+ when it finishes, it will sleep for a few seconds and then
examine the watchfile again; if anything has been added, it
will read the new paths, synchronize them, and go back to
sleep
+ that's it!
To use this to drive Unison "incrementally," just start it in this
- mode and start up a tool (on each host) to watch for new changes
- to the filesystem and append the appropriate paths to the
- watchfile. Hopefully such tools should not be too hard to write.
+ mode and start up a tool (on each host) to watch for new changes to
+ the filesystem and append the appropriate paths to the watchfile.
+ Hopefully such tools should not be too hard to write.
* Bug fixes:
+ Fixed a bug that was causing new files to be created with
permissions 0x600 instead of using a reasonable default (like
- 0x644), if the 'perms' flag was set to 0. (Bug reported by
- Ben Crowell.)
+ 0x644), if the 'perms' flag was set to 0. (Bug reported by Ben
+ Crowell.)
+ Follow maxthreads preference when transferring directories.
Changes since 2.17:
* Major rewrite and cleanup of the whole Mac OS X graphical user
interface by Craig Federighi. Thanks, Craig!!!
- * Small fix to ctime (non-)handling in update detection under
- windows with fastcheck.
+ * Small fix to ctime (non-)handling in update detection under windows
+ with fastcheck.
* Several small fixes to the GTK2 UI to make it work better under
Windows [thanks to Karl M for these].
* The backup functionality has been completely rewritten. The
@@ -361,19 +357,19 @@
path as an error, rather than treating the symlink itself as
missing or deleted. This avoids a potentially dangerous
situation where a followed symlink points to an external
- filesystem that might be offline when Unison is run
- (whereupon Unison would cheerfully delete the corresponding
- files in the other replica!).
+ filesystem that might be offline when Unison is run (whereupon
+ Unison would cheerfully delete the corresponding files in the
+ other replica!).
* Smaller changes:
- + Added forcepartial and preferpartial preferences, which
- behave like force and prefer but can be specified on a
- per-path basis. [Thanks to Alan Schmitt for this.]
+ + Added forcepartial and preferpartial preferences, which behave
+ like force and prefer but can be specified on a per-path
+ basis. [Thanks to Alan Schmitt for this.]
+ A bare-bones self test feature was added, which runs unison
through some of its paces and checks that the results are as
- expected. The coverage of the tests is still very limited,
- but the facility has already been very useful in debugging
- the new backup functionality (especially in exposing some
- subtle cross-platform issues).
+ expected. The coverage of the tests is still very limited, but
+ the facility has already been very useful in debugging the new
+ backup functionality (especially in exposing some subtle
+ cross-platform issues).
+ Refined debugging code so that the verbosity of individual
modules can be controlled separately. Instead of just putting
'-debug verbose' on the command line, you can put '-debug
@@ -386,33 +382,31 @@
cooperation with external Harmony instances.
+ Changed the temp file prefix from .# to .unison.
+ Compressed the output from the text user interface
- (particularly when run with the -terse flag) to make it
- easier to interpret the results when Unison is run several
- times in succession from a script.
+ (particularly when run with the -terse flag) to make it easier
+ to interpret the results when Unison is run several times in
+ succession from a script.
+ Diff and merge functions now work under Windows.
- + Changed the order of arguments to the default diff command
- (so that the + and - annotations in diff's output are
- reversed).
+ + Changed the order of arguments to the default diff command (so
+ that the + and - annotations in diff's output are reversed).
+ Added .mpp files to the "never fastcheck" list (like .xls
files).
* Many small bugfixes, including:
+ Fixed a longstanding bug regarding fastcheck and daylight
- saving time under Windows when Unison is set up to
- synchronize modification times. (Modification times cannot be
- updated in the archive in this case, so we have to ignore one
- hour differences.)
+ saving time under Windows when Unison is set up to synchronize
+ modification times. (Modification times cannot be updated in
+ the archive in this case, so we have to ignore one hour
+ differences.)
+ Fixed a bug that would occasionally cause the archives to be
left in non-identical states on the two hosts after
synchronization.
- + Fixed a bug that prevented Unison from communicating
- correctly between 32- and 64-bit architectures.
+ + Fixed a bug that prevented Unison from communicating correctly
+ between 32- and 64-bit architectures.
+ On windows, file creation times are no longer used as a proxy
- for inode numbers. (This is unfortunate, as it makes
- fastcheck a little less safe. But it turns out that file
- creation times are not reliable under Windows: if a file is
- removed and a new file is created in its place, the new one
- will sometimes be given the same creation date as the old
- one!)
+ for inode numbers. (This is unfortunate, as it makes fastcheck
+ a little less safe. But it turns out that file creation times
+ are not reliable under Windows: if a file is removed and a new
+ file is created in its place, the new one will sometimes be
+ given the same creation date as the old one!)
+ Set read-only file to R/W on OSX before attempting to change
other attributes.
+ Fixed bug resulting in spurious "Aborted" errors during
@@ -430,8 +424,8 @@
fail with the message "Failed: Error in readWrite: Is a
directory."
+ Replaced symlinks with copies of their targets in the Growl
- framework in src/uimac. This should make the sources easier
- to check out from the svn repository on WinXP systems.
+ framework in src/uimac. This should make the sources easier to
+ check out from the svn repository on WinXP systems.
+ Added a workaround (suggested by Karl M.) for the problem
discussed on the unison users mailing list where, on the
Windows platform, the server would hang when transferring
@@ -439,14 +433,13 @@
mechanism, which was used to make a call back from the server
to the client (inside the Trace.log function) so that the log
message would be appended to the log file on the client. The
- workaround is to dump these messages (about when
- xferbycopying shortcuts are applied and whether they succeed)
- just to the standard output of the Unison process, not to the
- log file.
+ workaround is to dump these messages (about when xferbycopying
+ shortcuts are applied and whether they succeed) just to the
+ standard output of the Unison process, not to the log file.
Changes since 2.13.0:
- * The features for performing backups and for invoking external
- merge programs have been completely rewritten by Stephane Lescuyer
+ * The features for performing backups and for invoking external merge
+ programs have been completely rewritten by Stephane Lescuyer
(thanks, Stephane!). The user-visible functionality should not
change, but the internals have been rationalized and there are a
number of new features. See the manual (in particular, the
@@ -486,13 +479,12 @@
+ Improved workaround for button focus problem (GTK2 UI)
+ Put leading zeroes in date fields
+ More robust handling of character encodings in GTK2 UI
- + Changed format of modification time displays, from modified
- at hh:mm:ss on dd MMM, yyyy to modified on yyyy-mm-dd
- hh:mm:ss
- + Changed time display to include seconds (so that people on
- FAT filesystems will not be confused when Unison tries to
- update a file time to an odd number of seconds and the
- filesystem truncates it to an even number!)
+ + Changed format of modification time displays, from modified at
+ hh:mm:ss on dd MMM, yyyy to modified on yyyy-mm-dd hh:mm:ss
+ + Changed time display to include seconds (so that people on FAT
+ filesystems will not be confused when Unison tries to update a
+ file time to an odd number of seconds and the filesystem
+ truncates it to an even number!)
+ Use the diff "-u" option by default when showing differences
between files (the output is more readable)
+ In text mode, pipe the diff output to a pager if the
@@ -520,13 +512,13 @@
+ Disable multi-threading when both roots are local
+ Improved error handling code. In particular, make sure all
files are closed in case of a transient failure
- + Under Windows, use $UNISON for home directory as a last
- resort (it was wrongly moved before $HOME and $USERPROFILE in
- Unison 2.12.0)
+ + Under Windows, use $UNISON for home directory as a last resort
+ (it was wrongly moved before $HOME and $USERPROFILE in Unison
+ 2.12.0)
+ Reopen the logfile if its name changes (profile change)
- + Double-check that permissions and modification times have
- been properly set: there are some combination of OS and
- filesystem on which setting them can fail in a silent way.
+ + Double-check that permissions and modification times have been
+ properly set: there are some combination of OS and filesystem
+ on which setting them can fail in a silent way.
+ Check for bad Windows filenames for pure Windows
synchronization also (not just cross architecture
synchronization). This way, filenames containing backslashes,
@@ -538,8 +530,8 @@
+ Ignore trailing dots in filenames in case insensitive mode
+ Proper quoting of paths, files and extensions ignored using
the UI
- + The strings CURRENT1 and CURRENT2 are now correctly
- substitued when they occur in the diff preference
+ + The strings CURRENT1 and CURRENT2 are now correctly substitued
+ when they occur in the diff preference
+ Improvements to syncing resource forks between Macs via a
non-Mac system.
@@ -549,6 +541,7 @@
Subversion. One nice side-effect is that anonymous checkout is now
possible, like this:
svn co https://cvs.cis.upenn.edu:3690/svnroot/unison/
+
We will also continue to export a "developer tarball" of the
current (modulo one day) sources in the web export directory. To
receive commit logs for changes to the sources, subscribe to the
@@ -577,18 +570,17 @@
+ Fixed assertion failure when resolving a conflict content
change / permission changes in favor of the content change.
+ Workaround for transferring large files using rsync.
- + Use buffered I/O for files (this is the only way to open
- files in binary mode under Cygwin).
- + On non-Cygwin Windows systems, the UNISON environment
- variable is now checked first to determine where to look for
- Unison's archive and preference files, followed by HOME and
- USERPROFILE in that order. On Unix and Cygwin systems, HOME
- is used.
+ + Use buffered I/O for files (this is the only way to open files
+ in binary mode under Cygwin).
+ + On non-Cygwin Windows systems, the UNISON environment variable
+ is now checked first to determine where to look for Unison's
+ archive and preference files, followed by HOME and USERPROFILE
+ in that order. On Unix and Cygwin systems, HOME is used.
+ Generalized diff preference so that it can be given either as
- just the command name to be used for calculating diffs or
- else a whole command line, containing the strings CURRENT1
- and CURRENT2, which will be replaced by the names of the
- files to be diff'ed before the command is called.
+ just the command name to be used for calculating diffs or else
+ a whole command line, containing the strings CURRENT1 and
+ CURRENT2, which will be replaced by the names of the files to
+ be diff'ed before the command is called.
+ Recognize password prompts in some newer versions of ssh.
Changes since 2.9.20:
@@ -597,13 +589,13 @@
+ Major tidying and enhancement of 'merge' functionality. The
main user-visible change is that the external merge program
may either write the merged output to a single new file, as
- before, or it may modify one or both of its input files, or
- it may write two new files. In the latter cases, its
- modifications will be copied back into place on both the
- local and the remote host, and (if the two files are now
- equal) the archive will be updated appropriately. More
- information can be found in the user manual. Thanks to Malo
- Denielou and Alan Schmitt for these improvements.
+ before, or it may modify one or both of its input files, or it
+ may write two new files. In the latter cases, its
+ modifications will be copied back into place on both the local
+ and the remote host, and (if the two files are now equal) the
+ archive will be updated appropriately. More information can be
+ found in the user manual. Thanks to Malo Denielou and Alan
+ Schmitt for these improvements.
Warning: the new merging functionality is not completely
compatible with old versions! Check the manual for details.
+ Files larger than 2Gb are now supported.
@@ -617,8 +609,8 @@
Unison's archives, preference files, etc., is now
determined as follows:
# if ~/.unison exists, use it
- # otherwise, use ~/Library/Application
- Support/Unison, creating it if necessary.
+ # otherwise, use ~/Library/Application Support/Unison,
+ creating it if necessary.
o A preliminary native-Cocoa user interface is under
construction. This still needs some work, and some users
experience unpredictable crashes, so it is only for
@@ -633,25 +625,24 @@
directory matches one of the patterns set in this preference,
then update detection is skipped for files in this directory.
(The purpose is to speed update detection for cases like Mail
- folders, which contain lots and lots of immutable files.)
- Also a preference assumeContentsAreImmutableNot, which
- overrides the first, similarly to ignorenot. (Later
- amendment: these preferences are now called immutable and
- immutablenot.)
+ folders, which contain lots and lots of immutable files.) Also
+ a preference assumeContentsAreImmutableNot, which overrides
+ the first, similarly to ignorenot. (Later amendment: these
+ preferences are now called immutable and immutablenot.)
+ The ignorecase flag has been changed from a boolean to a
three-valued preference. The default setting, called default,
checks the operating systems running on the client and server
- and ignores filename case if either of them is OSX or
- Windows. Setting ignorecase to true or false overrides this
- behavior. If you have been setting ignorecase on the command
- line using -ignorecase=true or -ignorecase=false, you will
- need to change to -ignorecase true or -ignorecase false.
+ and ignores filename case if either of them is OSX or Windows.
+ Setting ignorecase to true or false overrides this behavior.
+ If you have been setting ignorecase on the command line using
+ -ignorecase=true or -ignorecase=false, you will need to change
+ to -ignorecase true or -ignorecase false.
+ a new preference, 'repeat', for the text user interface
(only). If 'repeat' is set to a number, then, after it
- finishes synchronizing, Unison will wait for that many
- seconds and then start over, continuing this way until it is
- killed from outside. Setting repeat to true will
- automatically set the batch preference to true.
+ finishes synchronizing, Unison will wait for that many seconds
+ and then start over, continuing this way until it is killed
+ from outside. Setting repeat to true will automatically set
+ the batch preference to true.
+ Excel files are now handled specially, so that the fastcheck
optimization is skipped even if the fastcheck flag is set.
(Excel does some naughty things with modtimes, making this
@@ -666,16 +657,16 @@
+ Added a new preference, 'repeat', for the text user interface
(only, at the moment). If 'repeat' is set to a number, then,
after it finishes synchronizing, Unison will wait for that
- many seconds and then start over, continuing this way until
- it is killed from outside. Setting repeat to true will
+ many seconds and then start over, continuing this way until it
+ is killed from outside. Setting repeat to true will
automatically set the batch preference to true.
+ The 'rshargs' preference has been split into 'rshargs' and
- 'sshargs' (mainly to make the documentation clearer). In
- fact, 'rshargs' is no longer mentioned in the documentation
- at all, since pretty much everybody uses ssh now anyway.
+ 'sshargs' (mainly to make the documentation clearer). In fact,
+ 'rshargs' is no longer mentioned in the documentation at all,
+ since pretty much everybody uses ssh now anyway.
* Documentation
- + The web pages have been completely redesigned and
- reorganized. (Thanks to Alan Schmitt for help with this.)
+ + The web pages have been completely redesigned and reorganized.
+ (Thanks to Alan Schmitt for help with this.)
* User interface improvements
+ Added a GTK2 user interface, capable (among other things) of
displaying filenames in any locale encoding. Kudos to Stephen
@@ -684,8 +675,8 @@
at the end of synchronization.
+ Restarting update detection from the graphical UI will reload
the current profile (which in particular will reset the -path
- preference, in case it has been narrowed by using the
- "Recheck unsynchronized items" command).
+ preference, in case it has been narrowed by using the "Recheck
+ unsynchronized items" command).
+ Several small improvements to the text user interface,
including a progress display.
* Bug fixes (too numerous to count, actually, but here are some):
@@ -719,8 +710,8 @@
Changes since 2.9.1:
* Added a preference maxthreads that can be used to limit the number
of simultaneous file transfers.
- * Added a backupdir preference, which controls where backup files
- are stored.
+ * Added a backupdir preference, which controls where backup files are
+ stored.
* Basic support added for OSX. In particular, Unison now recognizes
when one of the hosts being synchronized is running OSX and
switches to a case-insensitive treatment of filenames (i.e., 'foo'
@@ -744,15 +735,14 @@
tuning.
* Makefile
+ Makefile.OCaml now sets UISTYLE=text or UISTYLE=gtk
- automatically, depending on whether it finds lablgtk
- installed
+ automatically, depending on whether it finds lablgtk installed
+ Unison should now compile "out of the box" under OSX
Changes since 2.8.1:
* Changing profile works again under Windows
* File movement optimization: Unison now tries to use local copy
- instead of transfer for moved or copied files. It is controled by
- a boolean option "xferbycopying".
+ instead of transfer for moved or copied files. It is controled by a
+ boolean option "xferbycopying".
* Network statistics window (transfer rate, amount of data
transferred). [NB: not available in Windows-Cygwin version.]
* symlinks work under the cygwin version (which is dynamically
@@ -761,8 +751,8 @@
Unix
* Small improvements:
+ If neither the USERPROFILE nor the HOME environment variables
- are set, then Unison will put its temporary commit log
- (called DANGER.README) into the directory named by the UNISON
+ are set, then Unison will put its temporary commit log (called
+ DANGER.README) into the directory named by the UNISON
environment variable, if any; otherwise it will use C:.
+ alternative set of values for fastcheck: yes = true; no =
false; default = auto.
@@ -777,13 +767,13 @@
anymore.
Changes since 2.7.78:
- * Small bugfix to textual user interface under Unix (to avoid
- leaving the terminal in a bad state where it would not echo inputs
- after Unison exited).
+ * Small bugfix to textual user interface under Unix (to avoid leaving
+ the terminal in a bad state where it would not echo inputs after
+ Unison exited).
Changes since 2.7.39:
- * Improvements to the main web page (stable and beta version docs
- are now both accessible).
+ * Improvements to the main web page (stable and beta version docs are
+ now both accessible).
* User manual revised.
* Added some new preferences:
+ "sshcmd" and "rshcmd" for specifying paths to ssh and rsh
@@ -807,34 +797,34 @@
* User interface and Unison behavior:
+ Renamed `Proceed' to `Go' in the graphical UI.
+ Added exit status for the textual user interface.
- + Paths that are not synchronized because of conflicts or
- errors during update detection are now noted in the log file.
+ + Paths that are not synchronized because of conflicts or errors
+ during update detection are now noted in the log file.
+ [END] messages in log now use a briefer format
- + Changed the text UI startup sequence so that ./unison -ui
- text will use the default profile instead of failing.
+ + Changed the text UI startup sequence so that ./unison -ui text
+ will use the default profile instead of failing.
+ Made some improvements to the error messages.
+ Added some debugging messages to remote.ml.
Changes since 2.7.7:
- * Incorporated, once again, a multi-threaded transport sub-system.
- It transfers several files at the same time, thereby making much
- more effective use of available network bandwidth. Unlike the
- earlier attempt, this time we do not rely on the native thread
- library of OCaml. Instead, we implement a light-weight,
- non-preemptive multi-thread library in OCaml directly. This
- version appears stable.
+ * Incorporated, once again, a multi-threaded transport sub-system. It
+ transfers several files at the same time, thereby making much more
+ effective use of available network bandwidth. Unlike the earlier
+ attempt, this time we do not rely on the native thread library of
+ OCaml. Instead, we implement a light-weight, non-preemptive
+ multi-thread library in OCaml directly. This version appears
+ stable.
Some adjustments to unison are made to accommodate the
multi-threaded version. These include, in particular, changes to
the user interface and logging, for example:
+ Two log entries for each transferring task, one for the
beginning, one for the end.
+ Suppressed warning messages against removing temp files left
- by a previous unison run, because warning does not work
- nicely under multi-threading. The temp file names are made
- less likely to coincide with the name of a file created by
- the user. They take the form
- .#<filename>.<serial>.unison.tmp. [N.b. This was later
- changed to .unison.<filename>.<serial>.unison.tmp.]
+ by a previous unison run, because warning does not work nicely
+ under multi-threading. The temp file names are made less
+ likely to coincide with the name of a file created by the
+ user. They take the form
+ .#<filename>.<serial>.unison.tmp. [N.b. This was later changed
+ to .unison.<filename>.<serial>.unison.tmp.]
* Added a new command to the GTK user interface: pressing 'f' causes
Unison to start a new update detection phase, using as paths just
those paths that have been detected as changed and not yet marked
@@ -842,17 +832,16 @@
Unison on just the set of paths still needing attention after a
previous run.
* Made the ignorecase preference user-visible, and changed the
- initialization code so that it can be manually set to true, even
- if neither host is running Windows. (This may be useful, e.g.,
- when using Unison running on a Unix system with a FAT volume
- mounted.)
+ initialization code so that it can be manually set to true, even if
+ neither host is running Windows. (This may be useful, e.g., when
+ using Unison running on a Unix system with a FAT volume mounted.)
* Small improvements and bug fixes:
+ Errors in preference files now generate fatal errors rather
than warnings at startup time. (I.e., you can't go on from
- them.) Also, we fixed a bug that was preventing these
- warnings from appearing in the text UI, so some users who
- have been running (unsuspectingly) with garbage in their
- prefs files may now get error reports.
+ them.) Also, we fixed a bug that was preventing these warnings
+ from appearing in the text UI, so some users who have been
+ running (unsuspectingly) with garbage in their prefs files may
+ now get error reports.
+ Error reporting for preference files now provides file name
and line number.
+ More intelligible message in the case of identical change to
@@ -872,8 +861,8 @@
1.2.3 library (patched version used for compiling under
Windows).
+ Added the option to compile unison on the Windows platform
- with Cygwin GNU C compiler. This option only supports
- building dynamically linked unison executables.
+ with Cygwin GNU C compiler. This option only supports building
+ dynamically linked unison executables.
Changes since 2.7.4:
* Fixed a silly (but debilitating) bug in the client startup
@@ -885,10 +874,10 @@
added to.
* Bug fix: read the initial connection header one byte at a time, so
that we don't block if the header is shorter than expected. (This
- bug did not affect normal operation -- it just made it hard to
- tell when you were trying to use Unison incorrectly with an old
- version of the server, since it would hang instead of giving an
- error message.)
+ bug did not affect normal operation -- it just made it hard to tell
+ when you were trying to use Unison incorrectly with an old version
+ of the server, since it would hang instead of giving an error
+ message.)
Changes since 2.6.59:
* Changed fastcheck from a boolean to a string preference. Its legal
@@ -898,16 +887,15 @@
default.
* Several preferences have been renamed for consistency. All
preference names are now spelled out in lowercase. For backward
- compatibility, the old names still work, but they are not
- mentioned in the manual any more.
+ compatibility, the old names still work, but they are not mentioned
+ in the manual any more.
* The temp files created by the 'diff' and 'merge' commands are now
named by prepending a new prefix to the file name, rather than
- appending a suffix. This should avoid confusing diff/merge
- programs that depend on the suffix to guess the type of the file
- contents.
+ appending a suffix. This should avoid confusing diff/merge programs
+ that depend on the suffix to guess the type of the file contents.
* We now set the keepalive option on the server socket, to make sure
- that the server times out if the communication link is
- unexpectedly broken.
+ that the server times out if the communication link is unexpectedly
+ broken.
* Bug fixes:
+ When updating small files, Unison now closes the destination
file.
@@ -917,10 +905,10 @@
Changes since 2.6.38:
* Major Windows performance improvement!
- We've added a preference fastcheck that makes Unison look only at
- a file's creation time and last-modified time to check whether it
- has changed. This should result in a huge speedup when checking
- for updates in large replicas.
+ We've added a preference fastcheck that makes Unison look only at a
+ file's creation time and last-modified time to check whether it has
+ changed. This should result in a huge speedup when checking for
+ updates in large replicas.
When this switch is set, Unison will use file creation times as
'pseudo inode numbers' when scanning Windows replicas for updates,
instead of reading the full contents of every file. This may cause
@@ -939,30 +927,29 @@
* New functionality: centralized backups and merging
+ This version incorporates two pieces of major new
functionality, implemented by Sylvain Roy during a summer
- internship at Penn: a centralized backup facility that keeps
- a full backup of (selected files in) each replica, and a
- merging feature that allows Unison to invoke an external
- file-merging tool to resolve conflicting changes to
- individual files.
+ internship at Penn: a centralized backup facility that keeps a
+ full backup of (selected files in) each replica, and a merging
+ feature that allows Unison to invoke an external file-merging
+ tool to resolve conflicting changes to individual files.
+ Centralized backups:
o Unison now maintains full backups of the
- last-synchronized versions of (some of) the files in
- each replica; these function both as backups in the
- usual sense and as the "common version" when invoking
- external merge programs.
+ last-synchronized versions of (some of) the files in each
+ replica; these function both as backups in the usual
+ sense and as the "common version" when invoking external
+ merge programs.
o The backed up files are stored in a directory
- /.unison/backup on each host. (The name of this
- directory can be changed by setting the environment
- variable UNISONBACKUPDIR.)
+ /.unison/backup on each host. (The name of this directory
+ can be changed by setting the environment variable
+ UNISONBACKUPDIR.)
o The predicate backup controls which files are actually
- backed up: giving the preference 'backup = Path *'
- causes backing up of all files.
+ backed up: giving the preference 'backup = Path *' causes
+ backing up of all files.
o Files are added to the backup directory whenever unison
updates its archive. This means that
# When unison reconstructs its archive from scratch
- (e.g., because of an upgrade, or because the
- archive files have been manually deleted), all
- files will be backed up.
+ (e.g., because of an upgrade, or because the archive
+ files have been manually deleted), all files will be
+ backed up.
# Otherwise, each file will be backed up the first
time unison propagates an update for it.
o The preference backupversions controls how many previous
@@ -971,23 +958,23 @@
o For backward compatibility, the backups preference is
also still supported, but backup is now preferred.
o It is OK to manually delete files from the backup
- directory (or to throw away the directory itself).
- Before unison uses any of these files for anything
- important, it checks that its fingerprint matches the
- one that it expects.
+ directory (or to throw away the directory itself). Before
+ unison uses any of these files for anything important, it
+ checks that its fingerprint matches the one that it
+ expects.
+ Merging:
- o Both user interfaces offer a new 'merge' command,
- invoked by pressing 'm' (with a changed file selected).
+ o Both user interfaces offer a new 'merge' command, invoked
+ by pressing 'm' (with a changed file selected).
o The actual merging is performed by an external program.
- The preferences merge and merge2 control how this
- program is invoked. If a backup exists for this file
- (see the backup preference), then the merge preference
- is used for this purpose; otherwise merge2 is used. In
- both cases, the value of the preference should be a
- string representing the command that should be passed to
- a shell to invoke the merge program. Within this string,
- the special substrings CURRENT1, CURRENT2, NEW, and OLD
- may appear at any point. Unison will substitute these as
+ The preferences merge and merge2 control how this program
+ is invoked. If a backup exists for this file (see the
+ backup preference), then the merge preference is used for
+ this purpose; otherwise merge2 is used. In both cases,
+ the value of the preference should be a string
+ representing the command that should be passed to a shell
+ to invoke the merge program. Within this string, the
+ special substrings CURRENT1, CURRENT2, NEW, and OLD may
+ appear at any point. Unison will substitute these as
follows before invoking the command:
# CURRENT1 is replaced by the name of the local copy
of the file;
@@ -995,18 +982,18 @@
file, into which the contents of the remote copy of
the file have been transferred by Unison prior to
performing the merge;
- # NEW is replaced by the name of a temporary file
- that Unison expects to be written by the merge
- program when it finishes, giving the desired new
- contents of the file; and
- # OLD is replaced by the name of the backed up copy
- of the original version of the file (i.e., its
- state at the end of the last successful run of
- Unison), if one exists (applies only to merge, not
- merge2).
- For example, on Unix systems setting the merge
- preference to
+ # NEW is replaced by the name of a temporary file that
+ Unison expects to be written by the merge program
+ when it finishes, giving the desired new contents of
+ the file; and
+ # OLD is replaced by the name of the backed up copy of
+ the original version of the file (i.e., its state at
+ the end of the last successful run of Unison), if
+ one exists (applies only to merge, not merge2).
+ For example, on Unix systems setting the merge preference
+ to
merge = diff3 -m CURRENT1 OLD CURRENT2 > NEW
+
will tell Unison to use the external diff3 program for
merging.
A large number of external merging programs are
@@ -1016,43 +1003,44 @@
nil "NEW")'
merge = emacs -q --eval '(ediff-merge-files-with-ancestor
"CURRENT1" "CURRENT2" "OLD" nil "NEW")'
+
(These commands are displayed here on two lines to avoid
running off the edge of the page. In your preference
file, each should be written on a single line.)
- o If the external program exits without leaving any file
- at the path NEW, Unison considers the merge to have
- failed. If the merge program writes a file called NEW
- but exits with a non-zero status code, then Unison
- considers the merge to have succeeded but to have
- generated conflicts. In this case, it attempts to invoke
- an external editor so that the user can resolve the
- conflicts. The value of the editor preference controls
- what editor is invoked by Unison. The default is emacs.
- o Please send us suggestions for other useful values of
- the merge2 and merge preferences - we'd like to give
- several examples in the manual.
+ o If the external program exits without leaving any file at
+ the path NEW, Unison considers the merge to have failed.
+ If the merge program writes a file called NEW but exits
+ with a non-zero status code, then Unison considers the
+ merge to have succeeded but to have generated conflicts.
+ In this case, it attempts to invoke an external editor so
+ that the user can resolve the conflicts. The value of the
+ editor preference controls what editor is invoked by
+ Unison. The default is emacs.
+ o Please send us suggestions for other useful values of the
+ merge2 and merge preferences - we'd like to give several
+ examples in the manual.
* Smaller changes:
+ When one preference file includes another, unison no longer
adds the suffix '.prf' to the included file by default. If a
file with precisely the given name exists in the .unison
- directory, it will be used; otherwise Unison will add .prf,
- as it did before. (This change means that included preference
+ directory, it will be used; otherwise Unison will add .prf, as
+ it did before. (This change means that included preference
files can be named blah.include instead of blah.prf, so that
unison will not offer them in its 'choose a preference file'
dialog.)
- + For Linux systems, we now offer both a statically linked and
- a dynamically linked executable. The static one is larger,
- but will probably run on more systems, since it doesn't
- depend on the same versions of dynamically linked library
- modules being available.
- + Fixed the force and prefer preferences, which were getting
- the propagation direction exactly backwards.
+ + For Linux systems, we now offer both a statically linked and a
+ dynamically linked executable. The static one is larger, but
+ will probably run on more systems, since it doesn't depend on
+ the same versions of dynamically linked library modules being
+ available.
+ + Fixed the force and prefer preferences, which were getting the
+ propagation direction exactly backwards.
+ Fixed a bug in the startup code that would cause unison to
crash when the default profile (~/.unison/default.prf) does
not exist.
- + Fixed a bug where, on the run when a profile is first
- created, Unison would confusingly display the roots in
- reverse order in the user interface.
+ + Fixed a bug where, on the run when a profile is first created,
+ Unison would confusingly display the roots in reverse order in
+ the user interface.
* For developers:
+ We've added a module dependency diagram to the source
distribution, in src/DEPENDENCIES.ps, to help new prospective
@@ -1062,10 +1050,10 @@
* INCOMPATIBLE CHANGE: Archive format has changed.
* INCOMPATIBLE CHANGE: The startup sequence has been completely
rewritten and greatly simplified. The main user-visible change is
- that the defaultpath preference has been removed. Its effect can
- be approximated by using multiple profiles, with include
- directives to incorporate common settings. All uses of defaultpath
- in existing profiles should be changed to path.
+ that the defaultpath preference has been removed. Its effect can be
+ approximated by using multiple profiles, with include directives to
+ incorporate common settings. All uses of defaultpath in existing
+ profiles should be changed to path.
Another change in startup behavior that will affect some users is
that it is no longer possible to specify roots both in the profile
and on the command line.
@@ -1079,17 +1067,18 @@
common.prf =
<everything else>
+
Now do
unison common root1 root2
+
when you want to specify roots explicitly.
- * The -prefer and -force options have been extended to allow users
- to specify that files with more recent modtimes should be
- propagated, writing either -prefer newer or -force newer. (For
- symmetry, Unison will also accept -prefer older or -force older.)
- The -force older/newer options can only be used when -times is
- also set.
- The graphical user interface provides access to these facilities
- on a one-off basis via the Actions menu.
+ * The -prefer and -force options have been extended to allow users to
+ specify that files with more recent modtimes should be propagated,
+ writing either -prefer newer or -force newer. (For symmetry, Unison
+ will also accept -prefer older or -force older.) The -force
+ older/newer options can only be used when -times is also set.
+ The graphical user interface provides access to these facilities on
+ a one-off basis via the Actions menu.
* Names of roots can now be "aliased" to allow replicas to be
relocated without changing the name of the archive file where
Unison stores information between runs. (This feature is for
@@ -1103,25 +1092,24 @@
profiles. If a profile contains a preference of the form 'key
= n', where n is a single digit, then pressing this key will
cause Unison to immediately switch to this profile and begin
- synchronization again from scratch. (Any actions that may
- have been selected for a set of changes currently being
- displayed will be discarded.)
+ synchronization again from scratch. (Any actions that may have
+ been selected for a set of changes currently being displayed
+ will be discarded.)
+ Each profile may include a preference 'label = <string>'
giving a descriptive string that described the options
selected in this profile. The string is listed along with the
- profile name in the profile selection dialog, and displayed
- in the top-right corner of the main Unison window.
+ profile name in the profile selection dialog, and displayed in
+ the top-right corner of the main Unison window.
* Minor:
+ Fixed a bug that would sometimes cause the 'diff' display to
- order the files backwards relative to the main user
- interface. (Thanks to Pascal Brisset for this fix.)
+ order the files backwards relative to the main user interface.
+ (Thanks to Pascal Brisset for this fix.)
+ On Unix systems, the graphical version of Unison will check
- the DISPLAY variable and, if it is not set, automatically
- fall back to the textual user interface.
+ the DISPLAY variable and, if it is not set, automatically fall
+ back to the textual user interface.
+ Synchronization paths (path preferences) are now matched
- against the ignore preferences. So if a path is both
- specified in a path preference and ignored, it will be
- skipped.
+ against the ignore preferences. So if a path is both specified
+ in a path preference and ignored, it will be skipped.
+ Numerous other bugfixes and small improvements.
Changes since 2.6.1:
@@ -1157,15 +1145,14 @@
* New functionality:
+ Unison now synchronizes file modtimes, user-ids, and
group-ids.
- These new features are controlled by a set of new
- preferences, all of which are currently false by default.
+ These new features are controlled by a set of new preferences,
+ all of which are currently false by default.
o When the times preference is set to true, file
modification times are propaged. (Because the
- representations of time may not have the same
- granularity on both replicas, Unison may not always be
- able to make the modtimes precisely equal, but it will
- get them as close as the operating systems involved
- allow.)
+ representations of time may not have the same granularity
+ on both replicas, Unison may not always be able to make
+ the modtimes precisely equal, but it will get them as
+ close as the operating systems involved allow.)
o When the owner preference is set to true, file ownership
information is synchronized.
o When the group preference is set to true, group
@@ -1183,34 +1170,33 @@
be synchronized. It is set by default to 0o1777: all bits but
the set-uid and set-gid bits are synchronised (synchronizing
theses latter bits can be a security hazard). If you want to
- synchronize all bits, you can set the value of this
- preference to -1.
+ synchronize all bits, you can set the value of this preference
+ to -1.
+ Added a log preference (default false), which makes Unison
keep a complete record of the changes it makes to the
replicas. By default, this record is written to a file called
- unison.log in the user's home directory (the value of the
- HOME environment variable). If you want it someplace else,
- set the logfile preference to the full pathname you want
- Unison to use.
- + Added an ignorenot preference that maintains a set of
- patterns for paths that should definitely not be ignored,
- whether or not they match an ignore pattern. (That is, a path
- will now be ignored iff it matches an ignore pattern and does
- not match any ignorenot patterns.)
+ unison.log in the user's home directory (the value of the HOME
+ environment variable). If you want it someplace else, set the
+ logfile preference to the full pathname you want Unison to
+ use.
+ + Added an ignorenot preference that maintains a set of patterns
+ for paths that should definitely not be ignored, whether or
+ not they match an ignore pattern. (That is, a path will now be
+ ignored iff it matches an ignore pattern and does not match
+ any ignorenot patterns.)
* User-interface improvements:
+ Roots are now displayed in the user interface in the same
order as they were given on the command line or in the
preferences file.
- + When the batch preference is set, the graphical user
- interface no longer waits for user confirmation when it
- displays a warning message: it simply pops up an advisory
- window with a Dismiss button at the bottom and keeps on
- going.
+ + When the batch preference is set, the graphical user interface
+ no longer waits for user confirmation when it displays a
+ warning message: it simply pops up an advisory window with a
+ Dismiss button at the bottom and keeps on going.
+ Added a new preference for controlling how many status
messages are printed during update detection: statusdepth
controls the maximum depth for paths on the local machine
- (longer paths are not displayed, nor are non-directory
- paths). The value should be an integer; default is 1.
+ (longer paths are not displayed, nor are non-directory paths).
+ The value should be an integer; default is 1.
+ Removed the trace and silent preferences. They did not seem
very useful, and there were too many preferences for
controlling output in various ways.
@@ -1222,11 +1208,11 @@
host (which is used, for example, in calculating the name of
the archive file used to remember which files have been
synchronized) normally uses the gethostname operating system
- call. However, if the environment variable
- UNISONLOCALHOSTNAME is set, its value will now be used
- instead. This makes it easier to use Unison in situations
- where a machine's name changes frequently (e.g., because it
- is a laptop and gets moved around a lot).
+ call. However, if the environment variable UNISONLOCALHOSTNAME
+ is set, its value will now be used instead. This makes it
+ easier to use Unison in situations where a machine's name
+ changes frequently (e.g., because it is a laptop and gets
+ moved around a lot).
+ File owner and group are now displayed in the "detail window"
at the bottom of the screen, when unison is configured to
synchronize them.
@@ -1248,11 +1234,11 @@
information that should be useful for identifying sources of
problems.
+ The version number of the remote server is now checked right
- away during the connection setup handshake, rather than
- later. (Somebody sent a bug report of a server crash that
- turned out to come from using inconsistent versions: better
- to check this earlier and in a way that can't crash either
- client or server.)
+ away during the connection setup handshake, rather than later.
+ (Somebody sent a bug report of a server crash that turned out
+ to come from using inconsistent versions: better to check this
+ earlier and in a way that can't crash either client or
+ server.)
+ Unison now runs correctly on 64-bit architectures (e.g. Alpha
linux). We will not be distributing binaries for these
architectures ourselves (at least for a while) but if someone
@@ -1260,8 +1246,8 @@
link to them.
* Bug fixes:
+ Pattern matching (e.g. for ignore) is now case-insensitive
- when Unison is in case-insensitive mode (i.e., when one of
- the replicas is on a windows machine).
+ when Unison is in case-insensitive mode (i.e., when one of the
+ replicas is on a windows machine).
+ Some people had trouble with mysterious failures during
propagation of updates, where files would be falsely reported
as having changed during synchronization. This should be
@@ -1270,9 +1256,9 @@
Changes since 2.4.1:
* Added a number of 'sorting modes' for the user interface. By
- default, conflicting changes are displayed at the top, and the
- rest of the entries are sorted in alphabetical order. This
- behavior can be changed in the following ways:
+ default, conflicting changes are displayed at the top, and the rest
+ of the entries are sorted in alphabetical order. This behavior can
+ be changed in the following ways:
+ Setting the sortnewfirst preference to true causes newly
created files to be displayed before changed files.
+ Setting sortbysize causes files to be displayed in increasing
@@ -1303,15 +1289,15 @@
* Small changes:
+ Changed default answer to 'Yes' in all two-button dialogs in
the graphical interface (this seems more intuitive).
- + The rsync preference has been removed (it was used to
- activate rsync compression for file transfers, but rsync
- compression is now enabled by default).
+ + The rsync preference has been removed (it was used to activate
+ rsync compression for file transfers, but rsync compression is
+ now enabled by default).
+ In the text user interface, the arrows indicating which
- direction changes are being propagated are printed
- differently when the user has overridded Unison's default
- recommendation (====> instead of ---->). This matches the
- behavior of the graphical interface, which displays such
- arrows in a different color.
+ direction changes are being propagated are printed differently
+ when the user has overridded Unison's default recommendation
+ (====> instead of ---->). This matches the behavior of the
+ graphical interface, which displays such arrows in a different
+ color.
+ Carriage returns (Control-M's) are ignored at the ends of
lines in profiles, for Windows compatibility.
+ All preferences are now fully documented in the user manual.
@@ -1322,8 +1308,8 @@
conflicts. The first sync after upgrading will be slow.
* New/improved functionality:
+ A new preference -sortbysize controls the order in which
- changes are displayed to the user: when it is set to true,
- the smallest changed files are displayed first. (The default
+ changes are displayed to the user: when it is set to true, the
+ smallest changed files are displayed first. (The default
setting is false.)
+ A new preference -sortnewfirst causes newly created files to
be listed before other updates in the user interface.
@@ -1334,16 +1320,16 @@
without an explicit protocol, we now assume it refers to a
file. (Previously "//saul/foo" meant to use SSH to connect to
saul, then access the foo directory. Now it means to access
- saul via a remote file mechanism such as samba; the old
- effect is now achieved by writing ssh://saul/foo.)
+ saul via a remote file mechanism such as samba; the old effect
+ is now achieved by writing ssh://saul/foo.)
+ Changed the startup sequence for the case where roots are
given but no profile is given on the command line. The new
- behavior is to use the default profile (creating it if it
- does not exist), and temporarily override its roots. The
- manual claimed that this case would work by reading no
- profile at all, but AFAIK this was never true.
- + In all user interfaces, files with conflicts are always
- listed first
+ behavior is to use the default profile (creating it if it does
+ not exist), and temporarily override its roots. The manual
+ claimed that this case would work by reading no profile at
+ all, but AFAIK this was never true.
+ + In all user interfaces, files with conflicts are always listed
+ first
+ A new preference 'sshversion' can be used to control which
version of ssh should be used to connect to the server. Legal
values are 1 and 2. (Default is empty, which will make unison
@@ -1354,32 +1340,31 @@
a spurious conflict)
* Improvements for the Windows version:
+ The fact that filenames are treated case-insensitively under
- Windows should now be handled correctly. The exact behavior
- is described in the cross-platform section of the manual.
+ Windows should now be handled correctly. The exact behavior is
+ described in the cross-platform section of the manual.
+ It should be possible to synchronize with Windows shares,
e.g., //host/drive/path.
- + Workarounds to the bug in syncing root directories in
- Windows. The most difficult thing to fix is an ocaml bug:
- Unix.opendir fails on c: in some versions of Windows.
+ + Workarounds to the bug in syncing root directories in Windows.
+ The most difficult thing to fix is an ocaml bug: Unix.opendir
+ fails on c: in some versions of Windows.
* Improvements to the GTK user interface (the Tk interface is no
longer being maintained):
+ The UI now displays actions differently (in blue) when they
- have been explicitly changed by the user from Unison's
- default recommendation.
+ have been explicitly changed by the user from Unison's default
+ recommendation.
+ More colorful appearance.
+ The initial profile selection window works better.
- + If any transfers failed, a message to this effect is
- displayed along with 'Synchronization complete' at the end of
- the transfer phase (in case they may have scrolled off the
- top).
+ + If any transfers failed, a message to this effect is displayed
+ along with 'Synchronization complete' at the end of the
+ transfer phase (in case they may have scrolled off the top).
+ Added a global progress meter, displaying the percentage of
total bytes that have been transferred so far.
* Improvements to the text user interface:
+ The file details will be displayed automatically when a
conflict is been detected.
+ when a warning is generated (e.g. for a temporary file left
- over from a previous run of unison) Unison will no longer
- wait for a response if it is running in -batch mode.
+ over from a previous run of unison) Unison will no longer wait
+ for a response if it is running in -batch mode.
+ The UI now displays a short list of possible inputs each time
it waits for user interaction.
+ The UI now quits immediately (rather than looping back and
@@ -1392,11 +1377,10 @@
+ The manual now includes a FAQ, plus sections on common
problems and on tricks contributed by users.
+ Both the download page and the download directory explicitly
- say what are the current stable and beta-test version
- numbers.
- + The OCaml sources for the up-to-the-minute developers'
- version (not guaranteed to be stable, or even to compile, at
- any given time!) are now available from the download page.
+ say what are the current stable and beta-test version numbers.
+ + The OCaml sources for the up-to-the-minute developers' version
+ (not guaranteed to be stable, or even to compile, at any given
+ time!) are now available from the download page.
+ Added a subsection to the manual describing cross-platform
issues (case conflicts, illegal filenames)
* Many small bug fixes and random improvements.
@@ -1407,22 +1391,22 @@
'rename' error.
Changes since 2.2:
- * The multi-threaded transport system is now disabled by default.
- (It is not stable enough yet.)
+ * The multi-threaded transport system is now disabled by default. (It
+ is not stable enough yet.)
* Various bug fixes.
* A new experimental feature:
The final component of a -path argument may now be the wildcard
specifier *. When Unison sees such a path, it expands this path on
- the client into into the corresponding list of paths by listing
- the contents of that directory.
- Note that if you use wildcard paths from the command line, you
- will probably need to use quotes or a backslash to prevent the *
- from being interpreted by your shell.
- If both roots are local, the contents of the first one will be
- used for expanding wildcard paths. (Nb: this is the first one
- after the canonization step - i.e., the one that is listed first
- in the user interface - not the one listed first on the command
- line or in the preferences file.)
+ the client into into the corresponding list of paths by listing the
+ contents of that directory.
+ Note that if you use wildcard paths from the command line, you will
+ probably need to use quotes or a backslash to prevent the * from
+ being interpreted by your shell.
+ If both roots are local, the contents of the first one will be used
+ for expanding wildcard paths. (Nb: this is the first one after the
+ canonization step - i.e., the one that is listed first in the user
+ interface - not the one listed first on the command line or in the
+ preferences file.)
Changes since 2.1:
* The transport subsystem now includes an implementation by Sylvain
@@ -1430,15 +1414,15 @@
protocol. This protocol achieves much faster transfers when only a
small part of a large file has been changed by sending just diffs.
This feature is mainly helpful for transfers over slow links--on
- fast local area networks it can actually degrade performance--so
- we have left it off by default. Start unison with the -rsync
- option (or put rsync=true in your preferences file) to turn it on.
+ fast local area networks it can actually degrade performance--so we
+ have left it off by default. Start unison with the -rsync option
+ (or put rsync=true in your preferences file) to turn it on.
* "Progress bars" are now diplayed during remote file transfers,
showing what percentage of each file has been transferred so far.
* The version numbering scheme has changed. New releases will now be
- have numbers like 2.2.30, where the second component is
- incremented on every significant public release and the third
- component is the "patch level."
+ have numbers like 2.2.30, where the second component is incremented
+ on every significant public release and the third component is the
+ "patch level."
* Miscellaneous improvements to the GTK-based user interface.
* The manual is now available in PDF format.
* We are experimenting with using a multi-threaded transport
@@ -1446,14 +1430,13 @@
more effective use of available network bandwidth. This feature is
not completely stable yet, so by default it is disabled in the
release version of Unison.
- If you want to play with the multi-threaded version, you'll need
- to recompile Unison from sources (as described in the
- documentation), setting the THREADS flag in Makefile.OCaml to
- true. Make sure that your OCaml compiler has been installed with
- the -with-pthreads configuration option. (You can verify this by
- checking whether the file threads/threads.cma in the OCaml
- standard library directory contains the string -lpthread near the
- end.)
+ If you want to play with the multi-threaded version, you'll need to
+ recompile Unison from sources (as described in the documentation),
+ setting the THREADS flag in Makefile.OCaml to true. Make sure that
+ your OCaml compiler has been installed with the -with-pthreads
+ configuration option. (You can verify this by checking whether the
+ file threads/threads.cma in the OCaml standard library directory
+ contains the string -lpthread near the end.)
Changes since 1.292:
* Reduced memory footprint (this is especially important during the
@@ -1465,32 +1448,32 @@
interface (to avoid hitting them accidentally).
Changes since 1.231:
- * Tunneling over ssh is now supported in the Windows version. See
- the installation section of the manual for detailed instructions.
- * The transport subsystem now includes an implementation of the
- rsync protocol, built by Sylvain Gommier and Norman Ramsey. This
- protocol achieves much faster transfers when only a small part of
- a large file has been changed by sending just diffs. The rsync
- feature is off by default in the current version. Use the -rsync
- switch to turn it on. (Nb. We still have a lot of tuning to do:
- you may not notice much speedup yet.)
+ * Tunneling over ssh is now supported in the Windows version. See the
+ installation section of the manual for detailed instructions.
+ * The transport subsystem now includes an implementation of the rsync
+ protocol, built by Sylvain Gommier and Norman Ramsey. This protocol
+ achieves much faster transfers when only a small part of a large
+ file has been changed by sending just diffs. The rsync feature is
+ off by default in the current version. Use the -rsync switch to
+ turn it on. (Nb. We still have a lot of tuning to do: you may not
+ notice much speedup yet.)
* We're experimenting with a multi-threaded transport subsystem,
written by Jerome Vouillon. The downloadable binaries are still
single-threaded: if you want to try the multi-threaded version,
you'll need to recompile from sources. (Say make THREADS=true.)
- Native thread support from the compiler is required. Use the
- option -threads N to select the maximal number of concurrent
- threads (default is 5). Multi-threaded and single-threaded
- clients/servers can interoperate.
+ Native thread support from the compiler is required. Use the option
+ -threads N to select the maximal number of concurrent threads
+ (default is 5). Multi-threaded and single-threaded clients/servers
+ can interoperate.
* A new GTK-based user interface is now available, thanks to Jacques
Garrigue. The Tk user interface still works, but we'll be shifting
development effort to the GTK interface from now on.
* OCaml 3.00 is now required for compiling Unison from sources. The
modules uitk and myfileselect have been changed to use labltk
- instead of camltk. To compile the Tk interface in Windows, you
- must have ocaml-3.00 and tk8.3. When installing tk8.3, put it in
- c:\Tcl rather than the suggested c:\Program Files\Tcl, and be sure
- to install the headers and libraries (which are not installed by
+ instead of camltk. To compile the Tk interface in Windows, you must
+ have ocaml-3.00 and tk8.3. When installing tk8.3, put it in c:\Tcl
+ rather than the suggested c:\Program Files\Tcl, and be sure to
+ install the headers and libraries (which are not installed by
default).
* Added a new -addversionno switch, which causes unison to use
unison-<currentversionnumber> instead of just unison as the remote
@@ -1506,8 +1489,8 @@
+ Some cases where propagation of file permissions was not
working.
+ umask is now ignored when creating directories
- + directories are create writable, so that a read-only
- directory and its contents can be propagated.
+ + directories are create writable, so that a read-only directory
+ and its contents can be propagated.
+ Handling of warnings generated by the server.
+ Synchronizing a path whose parent is not a directory on both
sides is now flagged as erroneous.
@@ -1564,8 +1547,7 @@
causing spurious reports of different permissions when
synchronizing between windows and unix systems.
* Fixed one more non-tail-recursive list processing function, which
- was causing stack overflows when synchronizing very large
- replicas.
+ was causing stack overflows when synchronizing very large replicas.
Changes since 1.169:
* The text user interface now provides commands for ignoring files.
@@ -1573,17 +1555,21 @@
functions. Some power users have reported success with very large
replicas.
* INCOMPATIBLE CHANGE: Files ending in .tmp are no longer ignored
- automatically. If you want to ignore such files, put an
- appropriate ignore pattern in your profile.
+ automatically. If you want to ignore such files, put an appropriate
+ ignore pattern in your profile.
* INCOMPATIBLE CHANGE: The syntax of ignore and follow patterns has
changed. Instead of putting a line of the form
ignore = <regexp>
+
in your profile (.unison/default.prf), you should put:
ignore = Regex <regexp>
+
Moreover, two other styles of pattern are also recognized:
ignore = Name <name>
+
matches any path in which one component matches <name>, while
ignore = Path <path>
+
matches exactly the path <path>.
Standard "globbing" conventions can be used in <name> and <path>:
+ a ? matches any single character except /
@@ -1633,6 +1619,7 @@
* You can now have different preference files in your .unison
directory. If you start unison like this
unison profilename
+
(i.e. with just one "anonymous" command-line argument), then the
file ~/.unison/profilename.prf will be loaded instead of
default.prf.
@@ -1640,8 +1627,8 @@
* Added a switch -killServer that terminates the remote server
process when the unison client is shutting down, even when using
sockets for communication. (By default, a remote server created
- using ssh/rsh is terminated automatically, while a socket server
- is left running.)
+ using ssh/rsh is terminated automatically, while a socket server is
+ left running.)
* When started in 'socket server' mode, unison prints 'server
started' on stderr when it is ready to accept connections. (This
may be useful for scripts that want to tell when a socket-mode
Modified: branches/2.40/src/RECENTNEWS
===================================================================
--- branches/2.40/src/RECENTNEWS 2014-12-29 18:34:45 UTC (rev 536)
+++ branches/2.40/src/RECENTNEWS 2014-12-30 02:21:28 UTC (rev 537)
@@ -1,3 +1,9 @@
+CHANGES FROM VERSION 2.40.102
+
+* Backport fix for OCaml 4 to stable version (2.40)
+
+
+-------------------------------
CHANGES FROM VERSION 2.40.69
* Use hash function from OCaml 3.x for comparing archives, even when
Modified: branches/2.40/src/mkProjectInfo.ml
===================================================================
--- branches/2.40/src/mkProjectInfo.ml 2014-12-29 18:34:45 UTC (rev 536)
+++ branches/2.40/src/mkProjectInfo.ml 2014-12-30 02:21:28 UTC (rev 537)
@@ -100,3 +100,4 @@
+
Modified: branches/2.40/src/strings.ml
===================================================================
--- branches/2.40/src/strings.ml 2014-12-29 18:34:45 UTC (rev 536)
+++ branches/2.40/src/strings.ml 2014-12-30 02:21:28 UTC (rev 537)
@@ -4,7 +4,7 @@
let docs =
("about", ("About Unison",
"Unison File Synchronizer\n\
- Version 2.40.65\n\
+ Version 2.40.102\n\
\n\
"))
::
@@ -20,16 +20,15 @@
\032 Unison shares a number of features with tools such as configuration\n\
\032 management packages (CVS (http://www.cyclic.com/), PRCS\n\
\032 (http://www.XCF.Berkeley.EDU/~jmacd/prcs.html), etc.), distributed\n\
- \032 filesystems (Coda (http://www.coda.cs.cmu.edu/), etc.),\n\
- \032 uni-directional mirroring utilities (rsync\n\
- \032 (http://samba.anu.edu.au/rsync/), etc.), and other synchronizers\n\
- \032 (Intellisync (http://www.pumatech.com), Reconcile\n\
+ \032 filesystems (Coda (http://www.coda.cs.cmu.edu/), etc.), uni-directional\n\
+ \032 mirroring utilities (rsync (http://samba.anu.edu.au/rsync/), etc.), and\n\
+ \032 other synchronizers (Intellisync (http://www.pumatech.com), Reconcile\n\
\032 (http://www.merl.com/reports/TR99-14/), etc). However, there are\n\
\032 several points where it differs:\n\
- \032 * Unison runs on both Windows (95, 98, NT, 2k, and XP) and Unix\n\
- \032 (OSX, Solaris, Linux, etc.) systems. Moreover, Unison works across\n\
- \032 platforms, allowing you to synchronize a Windows laptop with a\n\
- \032 Unix server, for example.\n\
+ \032 * Unison runs on both Windows (95, 98, NT, 2k, and XP) and Unix (OSX,\n\
+ \032 Solaris, Linux, etc.) systems. Moreover, Unison works across\n\
+ \032 platforms, allowing you to synchronize a Windows laptop with a Unix\n\
+ \032 server, for example.\n\
\032 * Unlike a distributed filesystem, Unison is a user-level program:\n\
\032 there is no need to modify the kernel or to have superuser\n\
\032 privileges on either host.\n\
@@ -44,10 +43,9 @@
\032 connections. Transfers of small updates to large files are\n\
\032 optimized using a compression protocol similar to rsync.\n\
\032 * Unison has a clear and precise specification, described below.\n\
- \032 * Unison is resilient to failure. It is careful to leave the\n\
- \032 replicas and its own private structures in a sensible state at all\n\
- \032 times, even in case of abnormal termination or communication\n\
- \032 failures.\n\
+ \032 * Unison is resilient to failure. It is careful to leave the replicas\n\
+ \032 and its own private structures in a sensible state at all times,\n\
+ \032 even in case of abnormal termination or communication failures.\n\
\032 * Unison is free; full source code is available under the GNU Public\n\
\032 License.\n\
\n\
@@ -118,11 +116,10 @@
\032 future, and we will occasionally release new versions with bug fixes,\n\
\032 small improvements, and contributed patches.\n\
\n\
- \032 Reports of bugs affecting correctness or safety are of interest to\n\
- \032 many people and will generally get high priority. Other bug reports\n\
- \032 will be looked at as time permits. Bugs should be reported to the\n\
- \032 users list at unison-users at yahoogroups.com\n\
- \032 (mailto:unison-users at yahoogroups.com).\n\
+ \032 Reports of bugs affecting correctness or safety are of interest to many\n\
+ \032 people and will generally get high priority. Other bug reports will be\n\
+ \032 looked at as time permits. Bugs should be reported to the users list at\n\
+ \032 unison-users at yahoogroups.com (mailto:unison-users at yahoogroups.com).\n\
\n\
\032 Feature requests are welcome, but will probably just be added to the\n\
\032 ever-growing todo list. They should also be sent to\n\
@@ -131,11 +128,11 @@
\032 Patches are even more welcome. They should be sent to\n\
\032 unison-hackers at lists.seas.upenn.edu\n\
\032 (mailto:unison-hackers at lists.seas.upenn.edu). (Since safety and\n\
- \032 robustness are Unison's most important properties, patches will be\n\
- \032 held to high standards of clear design and clean coding.) If you want\n\
- \032 to contribute to Unison, start by downloading the developer tarball\n\
- \032 from the download page. For some details on how the code is organized,\n\
- \032 etc., see the file CONTRIB.\n\
+ \032 robustness are Unison's most important properties, patches will be held\n\
+ \032 to high standards of clear design and clean coding.) If you want to\n\
+ \032 contribute to Unison, start by downloading the developer tarball from\n\
+ \032 the download page. For some details on how the code is organized, etc.,\n\
+ \032 see the file CONTRIB.\n\
\n\
"))
::
@@ -144,9 +141,9 @@
\n\
\032 This file is part of Unison.\n\
\n\
- \032 Unison is free software: you can redistribute it and/or modify it\n\
- \032 under the terms of the GNU General Public License as published by the\n\
- \032 Free Software Foundation, either version 3 of the License, or (at your\n\
+ \032 Unison is free software: you can redistribute it and/or modify it under\n\
+ \032 the terms of the GNU General Public License as published by the Free\n\
+ \032 Software Foundation, either version 3 of the License, or (at your\n\
\032 option) any later version.\n\
\n\
\032 Unison is distributed in the hope that it will be useful, but WITHOUT\n\
@@ -177,8 +174,8 @@
\032 steps should get you a fully working installation in a few minutes. If\n\
\032 you run into trouble, you may find the suggestions on the Frequently\n\
\032 Asked Questions page\n\
- \032 (http://www.cis.upenn.edu/~bcpierce/unison/faq.html) helpful.\n\
- \032 Pre-built binaries are available for a variety of platforms.\n\
+ \032 (http://www.cis.upenn.edu/~bcpierce/unison/faq.html) helpful. Pre-built\n\
+ \032 binaries are available for a variety of platforms.\n\
\n\
\032 Unison can be used with either of two user interfaces:\n\
\032 1. a simple textual interface, suitable for dumb terminals (and\n\
@@ -199,9 +196,9 @@
\032 http://www.cis.upenn.edu/~bcpierce/unison.\n\
\n\
\032 If a pre-built binary of Unison is available for the client machine's\n\
- \032 architecture, just download it and put it somewhere in your search\n\
- \032 path (if you're going to invoke it from the command line) or on your\n\
- \032 desktop (if you'll be click-starting it).\n\
+ \032 architecture, just download it and put it somewhere in your search path\n\
+ \032 (if you're going to invoke it from the command line) or on your desktop\n\
+ \032 (if you'll be click-starting it).\n\
\n\
\032 The executable file for the graphical version (with a name including\n\
\032 gtkui) actually provides both interfaces: the graphical one appears by\n\
@@ -219,12 +216,11 @@
\032 Check to make sure that what you have downloaded is really executable.\n\
\032 Either click-start it, or type \"unison -version\" at the command line.\n\
\n\
- \032 Unison can be used in three different modes: with different\n\
- \032 directories on a single machine, with a remote machine over a direct\n\
- \032 socket connection, or with a remote machine using ssh for\n\
- \032 authentication and secure transfer. If you intend to use the last\n\
- \032 option, you may need to install ssh; see the section \"Installing Ssh\"\n\
- \032 .\n\
+ \032 Unison can be used in three different modes: with different directories\n\
+ \032 on a single machine, with a remote machine over a direct socket\n\
+ \032 connection, or with a remote machine using ssh for authentication and\n\
+ \032 secure transfer. If you intend to use the last option, you may need to\n\
+ \032 install ssh; see the section \"Installing Ssh\" .\n\
\n\
Running Unison\n\
\n\
@@ -238,20 +234,19 @@
\032 old binary and installing the new one.\n\
\n\
\032 Before upgrading, it is a good idea to run the old version one last\n\
- \032 time, to make sure all your replicas are completely synchronized. A\n\
- \032 new version of Unison will sometimes introduce a different format for\n\
- \032 the archive files used to remember information about the previous\n\
- \032 state of the replicas. In this case, the old archive will be ignored\n\
- \032 (not deleted -- if you roll back to the previous version of Unison,\n\
- \032 you will find the old archives intact), which means that any\n\
- \032 differences between the replicas will show up as conflicts that need\n\
- \032 to be resolved manually.\n\
+ \032 time, to make sure all your replicas are completely synchronized. A new\n\
+ \032 version of Unison will sometimes introduce a different format for the\n\
+ \032 archive files used to remember information about the previous state of\n\
+ \032 the replicas. In this case, the old archive will be ignored (not\n\
+ \032 deleted -- if you roll back to the previous version of Unison, you will\n\
+ \032 find the old archives intact), which means that any differences between\n\
+ \032 the replicas will show up as conflicts that need to be resolved\n\
+ \032 manually.\n\
\n\
Building Unison from Scratch\n\
\n\
- \032 If a pre-built image is not available, you will need to compile it\n\
- \032 from scratch; the sources are available from the same place as the\n\
- \032 binaries.\n\
+ \032 If a pre-built image is not available, you will need to compile it from\n\
+ \032 scratch; the sources are available from the same place as the binaries.\n\
\n\
\032 In principle, Unison should work on any platform to which OCaml has\n\
\032 been ported and on which the Unix module is fully implemented. It has\n\
@@ -289,15 +284,15 @@
\n\
\032 http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html,\n\
\032 untar it, and follow the instructions to build and install it.\n\
- \032 (Quick start: make configure, then make, then make opt, then su\n\
- \032 and make install.)\n\
+ \032 (Quick start: make configure, then make, then make opt, then su and\n\
+ \032 make install.)\n\
\n\
\032 Now build unison. If your search paths are set up correctly, simply\n\
\032 typing make again should build a unison executable with a Gtk2\n\
\032 graphical interface. (In previous releases of Unison, it was necessary\n\
\032 to add UISTYLE=gtk2 to the 'make' command above. This requirement has\n\
- \032 been removed: the makefile should detect automatically when lablgtk2\n\
- \032 is present and set this flag automatically.)\n\
+ \032 been removed: the makefile should detect automatically when lablgtk2 is\n\
+ \032 present and set this flag automatically.)\n\
\n\
\032 Put the unison executable somewhere in your search path, either by\n\
\032 adding the Unison directory to your PATH variable or by copying the\n\
@@ -306,8 +301,8 @@
Mac OS X\n\
\n\
\032 To build the text-only user interface, follow the instructions above\n\
- \032 for building on Unix systems. You should do this first, even if you\n\
- \032 are also planning on building the GUI, just to make sure it works.\n\
+ \032 for building on Unix systems. You should do this first, even if you are\n\
+ \032 also planning on building the GUI, just to make sure it works.\n\
\n\
\032 To build the basic GUI version, you'll first need to download and\n\
\032 install the XCode developer tools from Apple. Once this is done, just\n\
@@ -326,9 +321,8 @@
\n\
Windows\n\
\n\
- \032 Although the binary distribution should work on any version of\n\
- \032 Windows, some people may want to build Unison from scratch on those\n\
- \032 systems too.\n\
+ \032 Although the binary distribution should work on any version of Windows,\n\
+ \032 some people may want to build Unison from scratch on those systems too.\n\
\n\
Bytecode version:\n\
\n\
@@ -338,14 +332,14 @@
\032 http://caml.inria.fr). Then grab a copy of Unison sources and type\n\
\032 make NATIVE=false\n\
\n\
- \032 to compile the bytecode. The result should be an executable file\n\
- \032 called unison.exe.\n\
+ \032 to compile the bytecode. The result should be an executable file called\n\
+ \032 unison.exe.\n\
\n\
Native version:\n\
\n\
- \032 Building a more efficient, native version of Unison on Windows\n\
- \032 requires a little more work. See the file INSTALL.win32 in the source\n\
- \032 code distribution.\n\
+ \032 Building a more efficient, native version of Unison on Windows requires\n\
+ \032 a little more work. See the file INSTALL.win32 in the source code\n\
+ \032 distribution.\n\
\n\
Installation Options\n\
\n\
@@ -374,16 +368,16 @@
\032 works on dumb terminals; the graphical interface is better for most\n\
\032 interactive use. For this tutorial, you can use either. If you are\n\
\032 running Unison from the command line, just typing unison will select\n\
- \032 either the text or the graphical interface, depending on which has\n\
- \032 been selected as default when the executable you are running was\n\
- \032 built. You can force the text interface even if graphical is the\n\
- \032 default by adding -ui text. The other command-line arguments to both\n\
- \032 versions are identical.\n\
+ \032 either the text or the graphical interface, depending on which has been\n\
+ \032 selected as default when the executable you are running was built. You\n\
+ \032 can force the text interface even if graphical is the default by adding\n\
+ \032 -ui text. The other command-line arguments to both versions are\n\
+ \032 identical.\n\
\n\
- \032 The graphical version can also be run directly by clicking on its\n\
- \032 icon, but this may require a little set-up (see the section\n\
- \032 \"Click-starting Unison\" ). For this tutorial, we assume that you're\n\
- \032 starting it from the command line.\n\
+ \032 The graphical version can also be run directly by clicking on its icon,\n\
+ \032 but this may require a little set-up (see the section \"Click-starting\n\
+ \032 Unison\" ). For this tutorial, we assume that you're starting it from\n\
+ \032 the command line.\n\
\n\
\032 Unison can synchronize files and directories on a single machine, or\n\
\032 between two machines on a network. (The same program runs on both\n\
@@ -405,8 +399,8 @@
\032 [the gtkui binary actually has both compiled in]--then download the\n\
\032 gtkui binary.)\n\
\n\
- \032 Create a small test directory a.tmp containing a couple of files\n\
- \032 and/or subdirectories, e.g.,\n\
+ \032 Create a small test directory a.tmp containing a couple of files and/or\n\
+ \032 subdirectories, e.g.,\n\
\032 mkdir a.tmp\n\
\032 touch a.tmp/a a.tmp/b\n\
\032 mkdir a.tmp/d\n\
@@ -450,22 +444,22 @@
\032 needs to be propagated. For example,\n\
\032 <--- new file c [f]\n\
\n\
- \032 indicates that the file c has been modified only in the second\n\
- \032 replica, and that the default action is therefore to propagate the new\n\
- \032 version to the first replica. To follow Unison's recommendation, press\n\
- \032 the \"f\" at the prompt.\n\
+ \032 indicates that the file c has been modified only in the second replica,\n\
+ \032 and that the default action is therefore to propagate the new version\n\
+ \032 to the first replica. To follow Unison's recommendation, press the \"f\"\n\
+ \032 at the prompt.\n\
\n\
\032 If both replicas are modified and their contents are different, then\n\
- \032 the changes are in conflict: <-?-> is displayed to indicate that\n\
- \032 Unison needs guidance on which replica should override the other.\n\
+ \032 the changes are in conflict: <-?-> is displayed to indicate that Unison\n\
+ \032 needs guidance on which replica should override the other.\n\
\032 new file <-?-> new file d/h []\n\
\n\
\032 By default, neither version will be propagated and both replicas will\n\
\032 remain as they are.\n\
\n\
- \032 If both replicas have been modified but their new contents are the\n\
- \032 same (as with the file b), then no propagation is necessary and\n\
- \032 nothing is shown. Unison simply notes that the file is up to date.\n\
+ \032 If both replicas have been modified but their new contents are the same\n\
+ \032 (as with the file b), then no propagation is necessary and nothing is\n\
+ \032 shown. Unison simply notes that the file is up to date.\n\
\n\
\032 These display conventions are used by both versions of the user\n\
\032 interface. The only difference lies in the way in which Unison's\n\
@@ -477,12 +471,12 @@
\032 interface will ask for instructions as to how to propagate the\n\
\032 change. If some default action is indicated (by an arrow), you can\n\
\032 simply press Return to go on to the next changed file. If you want\n\
- \032 to do something different with this file, press \"<\" or \">\" to\n\
- \032 force the change to be propagated from right to left or from left\n\
- \032 to right, or else press \"/\" to skip this file and leave both\n\
- \032 replicas alone. When it reaches the end of the list of modified\n\
- \032 files, Unison will ask you one more time whether it should proceed\n\
- \032 with the updates that have been selected.\n\
+ \032 to do something different with this file, press \"<\" or \">\" to force\n\
+ \032 the change to be propagated from right to left or from left to\n\
+ \032 right, or else press \"/\" to skip this file and leave both replicas\n\
+ \032 alone. When it reaches the end of the list of modified files,\n\
+ \032 Unison will ask you one more time whether it should proceed with\n\
+ \032 the updates that have been selected.\n\
\032 When Unison stops to wait for input from the user, pressing \"?\"\n\
\032 will always give a list of possible responses and their meanings.\n\
\n\
@@ -496,8 +490,8 @@
\032 right-arrow or \">\" key (which makes the a.tmp version override\n\
\032 b.tmp).\n\
\032 Every keyboard command can also be invoked from the menus at the\n\
- \032 top of the user interface. (Conversely, each menu item is\n\
- \032 annotated with its keyboard equivalent, if it has one.)\n\
+ \032 top of the user interface. (Conversely, each menu item is annotated\n\
+ \032 with its keyboard equivalent, if it has one.)\n\
\032 When you are satisfied with the directions for the propagation of\n\
\032 changes as shown in the main window, click the \"Go\" button to set\n\
\032 them in motion. A check sign will be displayed next to each\n\
@@ -515,9 +509,9 @@
\032 on the server doesn't need to display any user interface at all.)\n\
\n\
\032 It is important that the version of Unison installed on the server\n\
- \032 machine is the same as the version of Unison on the client machine.\n\
- \032 But some flexibility on the version of Unison at the client side can\n\
- \032 be achieved by using the -addversionno option; see the section\n\
+ \032 machine is the same as the version of Unison on the client machine. But\n\
+ \032 some flexibility on the version of Unison at the client side can be\n\
+ \032 achieved by using the -addversionno option; see the section\n\
\032 \"Preferences\" .\n\
\n\
\032 Now there is a decision to be made. Unison provides two methods for\n\
@@ -525,9 +519,8 @@
\032 * Remote shell method: To use this method, you must have some way of\n\
\032 invoking remote commands on the server from the client's command\n\
\032 line, using a facility such as ssh. This method is more convenient\n\
- \032 (since there is no need to manually start a \"unison server\"\n\
- \032 process on the server) and also more secure (especially if you use\n\
- \032 ssh).\n\
+ \032 (since there is no need to manually start a \"unison server\" process\n\
+ \032 on the server) and also more secure (especially if you use ssh).\n\
\032 * Socket method: This method requires only that you can get TCP\n\
\032 packets from the client to the server and back. A draconian\n\
\032 firewall can prevent this, but otherwise it should work anywhere.\n\
@@ -555,11 +548,10 @@
\032 should print the same version information as running\n\
\032 unison -version\n\
\n\
- \032 locally on the client. If remote execution fails, then either\n\
- \032 something is wrong with your ssh setup (e.g., \"permission denied\") or\n\
- \032 else the search path that's being used when executing commands on the\n\
- \032 server doesn't contain the unison executable (e.g., \"command not\n\
- \032 found\").\n\
+ \032 locally on the client. If remote execution fails, then either something\n\
+ \032 is wrong with your ssh setup (e.g., \"permission denied\") or else the\n\
+ \032 search path that's being used when executing commands on the server\n\
+ \032 doesn't contain the unison executable (e.g., \"command not found\").\n\
\n\
\032 Create a test directory a.tmp in your home directory on the client\n\
\032 machine.\n\
@@ -571,8 +563,8 @@
\032 Now cd to your home directory and type:\n\
\032 unison a.tmp ssh://remotehostname/a.tmp\n\
\n\
- \032 The result should be that the entire directory a.tmp is propagated\n\
- \032 from the client to your home directory on the server.\n\
+ \032 The result should be that the entire directory a.tmp is propagated from\n\
+ \032 the client to your home directory on the server.\n\
\n\
\032 After finishing the first synchronization, change a few files and try\n\
\032 synchronizing again. You should see similar results as in the local\n\
@@ -588,52 +580,53 @@
\032 an extra slash between remotehostname and the beginning of the\n\
\032 path:\n\
\032 unison a.tmp ssh://remotehostname//absolute/path/to/a.tmp\n\
+ \n\
\032 * You can give an explicit path for the unison executable on the\n\
\032 server by using the command-line option \"-servercmd\n\
\032 /full/path/name/of/unison\" or adding\n\
\032 \"servercmd=/full/path/name/of/unison\" to your profile (see the\n\
- \032 section \"Profile\" ). Similarly, you can specify a explicit path\n\
- \032 for the ssh program using the \"-sshcmd\" option. Extra arguments\n\
- \032 can be passed to ssh by setting the -sshargs preference.\n\
+ \032 section \"Profile\" ). Similarly, you can specify a explicit path for\n\
+ \032 the ssh program using the \"-sshcmd\" option. Extra arguments can be\n\
+ \032 passed to ssh by setting the -sshargs preference.\n\
\n\
Socket Method\n\
\n\
\032 Warning: The socket method is insecure: not only are the texts of\n\
- \032 your changes transmitted over the network in unprotected form, it\n\
- \032 is also possible for anyone in the world to connect to the server\n\
- \032 process and read out the contents of your filesystem! (Of course,\n\
- \032 to do this they must understand the protocol that Unison uses to\n\
- \032 communicate between client and server, but all they need for this\n\
- \032 is a copy of the Unison sources.) The socket method is provided\n\
- \032 only for expert users with specific needs; everyone else should use\n\
- \032 the ssh method.\n\
+ \032 your changes transmitted over the network in unprotected form, it is\n\
+ \032 also possible for anyone in the world to connect to the server\n\
+ \032 process and read out the contents of your filesystem! (Of course, to\n\
+ \032 do this they must understand the protocol that Unison uses to\n\
+ \032 communicate between client and server, but all they need for this is\n\
+ \032 a copy of the Unison sources.) The socket method is provided only\n\
+ \032 for expert users with specific needs; everyone else should use the\n\
+ \032 ssh method.\n\
\n\
\032 To run Unison over a socket connection, you must start a Unison daemon\n\
\032 process on the server. This process runs continuously, waiting for\n\
- \032 connections over a given socket from client machines running Unison\n\
- \032 and processing their requests in turn.\n\
+ \032 connections over a given socket from client machines running Unison and\n\
+ \032 processing their requests in turn.\n\
\n\
\032 To start the daemon, type\n\
\032 unison -socket NNNN\n\
\n\
\032 on the server machine, where NNNN is the socket number that the daemon\n\
\032 should listen on for connections from clients. (NNNN can be any large\n\
- \032 number that is not being used by some other program; if NNNN is\n\
- \032 already in use, Unison will exit with an error message.) Note that\n\
- \032 paths specified by the client will be interpreted relative to the\n\
- \032 directory in which you start the server process; this behavior is\n\
- \032 different from the ssh case, where the path is relative to your home\n\
- \032 directory on the server.\n\
+ \032 number that is not being used by some other program; if NNNN is already\n\
+ \032 in use, Unison will exit with an error message.) Note that paths\n\
+ \032 specified by the client will be interpreted relative to the directory\n\
+ \032 in which you start the server process; this behavior is different from\n\
+ \032 the ssh case, where the path is relative to your home directory on the\n\
+ \032 server.\n\
\n\
\032 Create a test directory a.tmp in your home directory on the client\n\
\032 machine. Now type:\n\
\032 unison a.tmp socket://remotehostname:NNNN/a.tmp\n\
\n\
- \032 The result should be that the entire directory a.tmp is propagated\n\
- \032 from the client to the server (a.tmp will be created on the server in\n\
- \032 the directory that the server was started from). After finishing the\n\
- \032 first synchronization, change a few files and try synchronizing again.\n\
- \032 You should see similar results as in the local case.\n\
+ \032 The result should be that the entire directory a.tmp is propagated from\n\
+ \032 the client to the server (a.tmp will be created on the server in the\n\
+ \032 directory that the server was started from). After finishing the first\n\
+ \032 synchronization, change a few files and try synchronizing again. You\n\
+ \032 should see similar results as in the local case.\n\
\n\
\032 Since the socket method is not used by many people, its functionality\n\
\032 is rather limited. For example, the server can only deal with one\n\
@@ -648,24 +641,26 @@
\032 (see the section \"Ignore\" ) to avoid synchronizing temporary files\n\
\032 and things that only belong on one host.\n\
\032 2. Create a subdirectory called shared (or current, or whatever) in\n\
- \032 your home directory on each host, and put all the files you want\n\
- \032 to synchronize into this directory.\n\
+ \032 your home directory on each host, and put all the files you want to\n\
+ \032 synchronize into this directory.\n\
\032 3. Create a subdirectory called shared (or current, or whatever) in\n\
\032 your home directory on each host, and put links to all the files\n\
\032 you want to synchronize into this directory. Use the follow\n\
- \032 preference (see the section \"Symbolic Links\" ) to make Unison\n\
- \032 treat these links as transparent.\n\
+ \032 preference (see the section \"Symbolic Links\" ) to make Unison treat\n\
+ \032 these links as transparent.\n\
\032 4. Make your home directory the root of the synchronization, but tell\n\
\032 Unison to synchronize only some of the files and subdirectories\n\
\032 within it on any given run. This can be accomplished by using the\n\
\032 -path switch on the command line:\n\
\032 unison /home/username ssh://remotehost//home/username -path shared\n\
+ \n\
\032 The -path option can be used as many times as needed, to\n\
\032 synchronize several files or subdirectories:\n\
\032 unison /home/username ssh://remotehost//home/username \\\n\
\032 -path shared \\\n\
\032 -path pub \\\n\
\032 -path .netscape/bookmarks.html\n\
+ \n\
\032 These -path arguments can also be put in your preference file. See\n\
\032 the section \"Preferences\" for an example.\n\
\n\
@@ -674,10 +669,10 @@
\032 always initiated from this host. (For example, if you're synchronizing\n\
\032 a laptop with a fileserver, you'll probably always run Unison on the\n\
\032 laptop.) This is a bit different from the usual situation with\n\
- \032 asymmetric mirroring programs like rdist, where the mirroring\n\
- \032 operation typically needs to be initiated from the machine with the\n\
- \032 most recent changes. the section \"Profile\" covers the syntax of Unison\n\
- \032 profiles, together with some sample profiles.\n\
+ \032 asymmetric mirroring programs like rdist, where the mirroring operation\n\
+ \032 typically needs to be initiated from the machine with the most recent\n\
+ \032 changes. the section \"Profile\" covers the syntax of Unison profiles,\n\
+ \032 together with some sample profiles.\n\
\n\
\032 Some tips on improving Unison's performance can be found on the\n\
\032 Frequently Asked Questions page\n\
@@ -708,9 +703,9 @@
\032 User's Manual (HTML or PostScript format) through\n\
\032 http://www.cis.upenn.edu/~bcpierce/unison.\n\
\n\
- \032 If you use Unison regularly, you should subscribe to one of the\n\
- \032 mailing lists, to receive announcements of new versions. See the\n\
- \032 section \"Mailing Lists\" .\n\
+ \032 If you use Unison regularly, you should subscribe to one of the mailing\n\
+ \032 lists, to receive announcements of new versions. See the section\n\
+ \032 \"Mailing Lists\" .\n\
\n\
"))
::
@@ -765,9 +760,9 @@
\n\
\032 port ::= [0-9]+\n\
\n\
- \032 When path is given without any protocol prefix, the protocol is\n\
- \032 assumed to be file:. Under Windows, it is possible to synchronize with\n\
- \032 a remote directory using the file: protocol over the Windows Network\n\
+ \032 When path is given without any protocol prefix, the protocol is assumed\n\
+ \032 to be file:. Under Windows, it is possible to synchronize with a remote\n\
+ \032 directory using the file: protocol over the Windows Network\n\
\032 Neighborhood. For example,\n\
\032 unison foo //host/drive/bar\n\
\n\
@@ -790,22 +785,22 @@
\032 A path refers to a point within a set of files being synchronized; it\n\
\032 is specified relative to the root of the replica.\n\
\n\
- \032 Formally, a path is just a sequence of names, separated by /. Note\n\
- \032 that the path separator character is always a forward slash, no matter\n\
- \032 what operating system Unison is running on. Forward slashes are\n\
- \032 converted to backslashes as necessary when paths are converted to\n\
- \032 filenames in the local filesystem on a particular host. (For example,\n\
- \032 suppose that we run Unison on a Windows system, synchronizing the\n\
- \032 local root c:\\pierce with the root\n\
- \032 ssh://saul.cis.upenn.edu/home/bcpierce on a Unix server. Then the path\n\
- \032 current/todo.txt refers to the file c:\\pierce\\current\\todo.txt on the\n\
- \032 client and /home/bcpierce/current/todo.txt on the server.)\n\
+ \032 Formally, a path is just a sequence of names, separated by /. Note that\n\
+ \032 the path separator character is always a forward slash, no matter what\n\
+ \032 operating system Unison is running on. Forward slashes are converted to\n\
+ \032 backslashes as necessary when paths are converted to filenames in the\n\
+ \032 local filesystem on a particular host. (For example, suppose that we\n\
+ \032 run Unison on a Windows system, synchronizing the local root c:\\pierce\n\
+ \032 with the root ssh://saul.cis.upenn.edu/home/bcpierce on a Unix server.\n\
+ \032 Then the path current/todo.txt refers to the file\n\
+ \032 c:\\pierce\\current\\todo.txt on the client and\n\
+ \032 /home/bcpierce/current/todo.txt on the server.)\n\
\n\
\032 The empty path (i.e., the empty sequence of names) denotes the whole\n\
\032 replica. Unison displays the empty path as \"[root].\"\n\
\n\
- \032 If p is a path and q is a path beginning with p, then q is said to be\n\
- \032 a descendant of p. (Each path is also a descendant of itself.)\n\
+ \032 If p is a path and q is a path beginning with p, then q is said to be a\n\
+ \032 descendant of p. (Each path is also a descendant of itself.)\n\
\n\
What is an Update?\n\
\n\
@@ -815,8 +810,8 @@
\032 * If p refers to an ordinary file, then the contents of p are the\n\
\032 actual contents of this file (a string of bytes) plus the current\n\
\032 permission bits of the file.\n\
- \032 * If p refers to a symbolic link, then the contents of p are just\n\
- \032 the string specifying where the link points.\n\
+ \032 * If p refers to a symbolic link, then the contents of p are just the\n\
+ \032 string specifying where the link points.\n\
\032 * If p refers to a directory, then the contents of p are just the\n\
\032 token \"DIRECTORY\" plus the current permission bits of the\n\
\032 directory.\n\
@@ -828,15 +823,15 @@
\032 contents at the last moment when they were the same in the two\n\
\032 replicas).\n\
\n\
- \032 We say that a path is updated (in some replica) if its current\n\
- \032 contents are different from its contents the last time it was\n\
- \032 successfully synchronized. Note that whether a path is updated has\n\
- \032 nothing to do with its last modification time--Unison considers only\n\
- \032 the contents when determining whether an update has occurred. This\n\
- \032 means that touching a file without changing its contents will not be\n\
- \032 recognized as an update. A file can even be changed several times and\n\
- \032 then changed back to its original contents; as long as Unison is only\n\
- \032 run at the end of this process, no update will be recognized.\n\
+ \032 We say that a path is updated (in some replica) if its current contents\n\
+ \032 are different from its contents the last time it was successfully\n\
+ \032 synchronized. Note that whether a path is updated has nothing to do\n\
+ \032 with its last modification time--Unison considers only the contents\n\
+ \032 when determining whether an update has occurred. This means that\n\
+ \032 touching a file without changing its contents will not be recognized as\n\
+ \032 an update. A file can even be changed several times and then changed\n\
+ \032 back to its original contents; as long as Unison is only run at the end\n\
+ \032 of this process, no update will be recognized.\n\
\n\
\032 What Unison actually calculates is a close approximation to this\n\
\032 definition; see the section \"Caveats and Shortcomings\" .\n\
@@ -845,17 +840,17 @@
\n\
\032 A path is said to be conflicting if the following conditions all hold:\n\
\032 1. it has been updated in one replica,\n\
- \032 2. it or any of its descendants has been updated in the other\n\
- \032 replica, and\n\
+ \032 2. it or any of its descendants has been updated in the other replica,\n\
+ \032 and\n\
\032 3. its contents in the two replicas are not identical.\n\
\n\
Reconciliation\n\
\n\
\032 Unison operates in several distinct stages:\n\
- \032 1. On each host, it compares its archive file (which records the\n\
- \032 state of each path in the replica when it was last synchronized)\n\
- \032 with the current contents of the replica, to determine which paths\n\
- \032 have been updated.\n\
+ \032 1. On each host, it compares its archive file (which records the state\n\
+ \032 of each path in the replica when it was last synchronized) with the\n\
+ \032 current contents of the replica, to determine which paths have been\n\
+ \032 updated.\n\
\032 2. It checks for \"false conflicts\" -- paths that have been updated on\n\
\032 both replicas, but whose current values are identical. These paths\n\
\032 are silently marked as synchronized in the archive files in both\n\
@@ -869,8 +864,7 @@
\032 updates.\n\
\032 4. It performs the selected actions, one at a time. Each action is\n\
\032 performed by first transferring the new contents to a temporary\n\
- \032 file on the receiving host, then atomically moving them into\n\
- \032 place.\n\
+ \032 file on the receiving host, then atomically moving them into place.\n\
\032 5. It updates its archive files to reflect the new state of the\n\
\032 replicas.\n\
\n\
@@ -897,15 +891,15 @@
\n\
\032 The upshot is that it is safe to interrupt Unison at any time, either\n\
\032 manually or accidentally. [Caveat: the above is almost true there are\n\
- \032 occasionally brief periods where it is not (and, because of\n\
- \032 shortcoming of the Posix filesystem API, cannot be); in particular,\n\
- \032 when it is copying a file onto a directory or vice versa, it must\n\
- \032 first move the original contents out of the way. If Unison gets\n\
- \032 interrupted during one of these periods, some manual cleanup may be\n\
- \032 required. In this case, a file called DANGER.README will be left in\n\
- \032 your home directory, containing information about the operation that\n\
- \032 was interrupted. The next time you try to run Unison, it will notice\n\
- \032 this file and warn you about it.]\n\
+ \032 occasionally brief periods where it is not (and, because of shortcoming\n\
+ \032 of the Posix filesystem API, cannot be); in particular, when it is\n\
+ \032 copying a file onto a directory or vice versa, it must first move the\n\
+ \032 original contents out of the way. If Unison gets interrupted during one\n\
+ \032 of these periods, some manual cleanup may be required. In this case, a\n\
+ \032 file called DANGER.README will be left in your home directory,\n\
+ \032 containing information about the operation that was interrupted. The\n\
+ \032 next time you try to run Unison, it will notice this file and warn you\n\
+ \032 about it.]\n\
\n\
\032 If an interruption happens while it is propagating updates, then there\n\
\032 may be some paths for which an update has been propagated but which\n\
@@ -940,9 +934,9 @@
\032 Touching a file without changing its contents should never affect\n\
\032 whether or not Unison does an update. (When running with the fastcheck\n\
\032 preference set to true--the default on Unix systems--Unison uses file\n\
- \032 modtimes for a quick first pass to tell which files have definitely\n\
- \032 not changed; then, for each file that might have changed, it computes\n\
- \032 a fingerprint of the file's contents and compares it against the\n\
+ \032 modtimes for a quick first pass to tell which files have definitely not\n\
+ \032 changed; then, for each file that might have changed, it computes a\n\
+ \032 fingerprint of the file's contents and compares it against the\n\
\032 last-synchronized contents. Also, the -times option allows you to\n\
\032 synchronize file times, but it does not cause identical files to be\n\
\032 changed; Unison will only modify the file times.)\n\
@@ -951,14 +945,13 @@
\032 replicas. The next time it runs, it will assume that all the files it\n\
\032 sees in the replicas are new.\n\
\n\
- \032 It is safe to modify files while Unison is working. If Unison\n\
- \032 discovers that it has propagated an out-of-date change, or that the\n\
- \032 file it is updating has changed on the target replica, it will signal\n\
- \032 a failure for that file. Run Unison again to propagate the latest\n\
- \032 change.\n\
+ \032 It is safe to modify files while Unison is working. If Unison discovers\n\
+ \032 that it has propagated an out-of-date change, or that the file it is\n\
+ \032 updating has changed on the target replica, it will signal a failure\n\
+ \032 for that file. Run Unison again to propagate the latest change.\n\
\n\
- \032 Changes to the ignore patterns from the user interface (e.g., using\n\
- \032 the `i' key) are immediately reflected in the current profile.\n\
+ \032 Changes to the ignore patterns from the user interface (e.g., using the\n\
+ \032 `i' key) are immediately reflected in the current profile.\n\
\n\
Caveats and Shortcomings\n\
\n\
@@ -973,39 +966,39 @@
\032 changed, then it concludes that the file has not been changed.\n\
\032 Under normal circumstances, this approximation is safe, in the\n\
\032 sense that it may sometimes detect \"false updates\" but will never\n\
- \032 miss a real one. However, it is possible to fool it, for example\n\
- \032 by using retouch to change a file's modtime back to a time in the\n\
+ \032 miss a real one. However, it is possible to fool it, for example by\n\
+ \032 using retouch to change a file's modtime back to a time in the\n\
\032 past.\n\
\032 * If you synchronize between a single-user filesystem and a shared\n\
\032 Unix server, you should pay attention to your permission bits: by\n\
\032 default, Unison will synchronize permissions verbatim, which may\n\
- \032 leave group-writable files on the server that could be written\n\
- \032 over by a lot of people.\n\
+ \032 leave group-writable files on the server that could be written over\n\
+ \032 by a lot of people.\n\
\032 You can control this by setting your umask on both computers to\n\
- \032 something like 022, masking out the \"world write\" and \"group\n\
- \032 write\" permission bits.\n\
+ \032 something like 022, masking out the \"world write\" and \"group write\"\n\
+ \032 permission bits.\n\
\032 Unison does not synchronize the setuid and setgid bits, for\n\
\032 security.\n\
- \032 * The graphical user interface is single-threaded. This means that\n\
- \032 if Unison is performing some long-running operation, the display\n\
- \032 will not be repainted until it finishes. We recommend not trying\n\
- \032 to do anything with the user interface while Unison is in the\n\
- \032 middle of detecting changes or propagating files.\n\
+ \032 * The graphical user interface is single-threaded. This means that if\n\
+ \032 Unison is performing some long-running operation, the display will\n\
+ \032 not be repainted until it finishes. We recommend not trying to do\n\
+ \032 anything with the user interface while Unison is in the middle of\n\
+ \032 detecting changes or propagating files.\n\
\032 * Unison does not understand hard links.\n\
\032 * It is important to be a little careful when renaming directories\n\
\032 containing ignored files.\n\
\032 For example, suppose Unison is synchronizing directory A between\n\
\032 the two machines called the \"local\" and the \"remote\" machine;\n\
- \032 suppose directory A contains a subdirectory D; and suppose D on\n\
- \032 the local machine contains a file or subdirectory P that matches\n\
- \032 an ignore directive in the profile used to synchronize. Thus path\n\
+ \032 suppose directory A contains a subdirectory D; and suppose D on the\n\
+ \032 local machine contains a file or subdirectory P that matches an\n\
+ \032 ignore directive in the profile used to synchronize. Thus path\n\
\032 A/D/P exists on the local machine but not on the remote machine.\n\
\032 If D is renamed to D' on the remote machine, and this change is\n\
- \032 propagated to the local machine, all such files or subdirectories\n\
- \032 P will be deleted. This is because Unison sees the rename as a\n\
- \032 delete and a separate create: it deletes the old directory\n\
- \032 (including the ignored files) and creates a new one (not including\n\
- \032 the ignored files, since they are completely invisible to it).\n\
+ \032 propagated to the local machine, all such files or subdirectories P\n\
+ \032 will be deleted. This is because Unison sees the rename as a delete\n\
+ \032 and a separate create: it deletes the old directory (including the\n\
+ \032 ignored files) and creates a new one (not including the ignored\n\
+ \032 files, since they are completely invisible to it).\n\
\n\
"))
::
@@ -1020,8 +1013,8 @@
"Running Unison\n\
\n\
\032 There are several ways to start Unison.\n\
- \032 * Typing \"unison profile\" on the command line. Unison will look for\n\
- \032 a file profile.prf in the .unison directory. If this file does not\n\
+ \032 * Typing \"unison profile\" on the command line. Unison will look for a\n\
+ \032 file profile.prf in the .unison directory. If this file does not\n\
\032 specify a pair of roots, Unison will prompt for them and add them\n\
\032 to the information specified by the profile.\n\
\032 * Typing \"unison profile root1 root2\" on the command line. In this\n\
@@ -1039,8 +1032,8 @@
\032 host. If the environment variable UNISON is defined, then its value\n\
\032 will be used as the name of this directory. If UNISON is not defined,\n\
\032 then the name of the directory depends on which operating system you\n\
- \032 are using. In Unix, the default is to use $HOME/.unison. In Windows,\n\
- \032 if the environment variable USERPROFILE is defined, then the directory\n\
+ \032 are using. In Unix, the default is to use $HOME/.unison. In Windows, if\n\
+ \032 the environment variable USERPROFILE is defined, then the directory\n\
\032 will be $USERPROFILE\\.unison; otherwise if HOME is defined, it will be\n\
\032 $HOME\\.unison; otherwise, it will be c:\\.unison.\n\
\n\
@@ -1072,14 +1065,13 @@
\032 occasionally useful to change the way archive names are generated.\n\
\032 Unison provides two ways of doing this.\n\
\n\
- \032 The function that finds the canonical hostname of the local host\n\
- \032 (which is used, for example, in calculating the name of the archive\n\
- \032 file used to remember which files have been synchronized) normally\n\
- \032 uses the gethostname operating system call. However, if the\n\
- \032 environment variable UNISONLOCALHOSTNAME is set, its value will be\n\
- \032 used instead. This makes it easier to use Unison in situations where a\n\
- \032 machine's name changes frequently (e.g., because it is a laptop and\n\
- \032 gets moved around a lot).\n\
+ \032 The function that finds the canonical hostname of the local host (which\n\
+ \032 is used, for example, in calculating the name of the archive file used\n\
+ \032 to remember which files have been synchronized) normally uses the\n\
+ \032 gethostname operating system call. However, if the environment variable\n\
+ \032 UNISONLOCALHOSTNAME is set, its value will be used instead. This makes\n\
+ \032 it easier to use Unison in situations where a machine's name changes\n\
+ \032 frequently (e.g., because it is a laptop and gets moved around a lot).\n\
\n\
\032 A more powerful way of changing archive names is provided by the\n\
\032 rootalias preference. The preference file may contain any number of\n\
@@ -1105,9 +1097,9 @@
\032 be used again. (If the original root and the alias refer to different\n\
\032 sets of files, Unison's update detector could get confused.) After\n\
\032 introducing a new rootalias, it is a good idea to run Unison a few\n\
- \032 times interactively (with the batch flag off, etc.) and carefully\n\
- \032 check that things look reasonable--in particular, that update\n\
- \032 detection is working as expected.\n\
+ \032 times interactively (with the batch flag off, etc.) and carefully check\n\
+ \032 that things look reasonable--in particular, that update detection is\n\
+ \032 working as expected.\n\
\n\
Preferences\n\
\n\
@@ -1178,8 +1170,8 @@
\032-copymax n maximum number of simultaneous copyprog transfers\n\
\032-copyprog xxx external program for copying large files\n\
\032-copyprogrest xxx variant of copyprog for resuming partial transfers\n\
- \032-copyquoterem xxx add quotes to remote file name for copyprog (true/false/def\n\
- ault)\n\
+ \032-copyquoterem xxx add quotes to remote file name for copyprog (true/false/defa\n\
+ ult)\n\
\032-copythreshold n use copyprog on files bigger than this (if >=0, in Kb)\n\
\032-debug xxx debug module xxx ('all' -> everything, 'verbose' -> more)\n\
\032-diff xxx set command for showing differences between files\n\
@@ -1201,13 +1193,13 @@
\032-key xxx define a keyboard shortcut for this profile (in some UIs)\n\
\032-killserver kill server when done (even when using sockets)\n\
\032-label xxx provide a descriptive string label for this profile\n\
- \032-links xxx allow the synchronization of symbolic links (true/false/def\n\
- ault)\n\
+ \032-links xxx allow the synchronization of symbolic links (true/false/defa\n\
+ ult)\n\
\032-log record actions in logfile (default true)\n\
\032-logfile xxx logfile name\n\
\032-maxbackups n number of backed up versions of a file\n\
- \032-maxerrors n maximum number of errors before a directory transfer is abo\n\
- rted\n\
+ \032-maxerrors n maximum number of errors before a directory transfer is abor\n\
+ ted\n\
\032-maxthreads n maximum number of simultaneous file transfers\n\
\032-merge xxx add a pattern to the merge list\n\
\032-mountpoint xxx abort if this path does not exist\n\
@@ -1232,28 +1224,29 @@
\032-sortnewfirst list new before changed files\n\
\032-sshargs xxx other arguments (if any) for remote shell command\n\
\032-sshcmd xxx path to the ssh executable\n\
- \032-stream use a streaming protocol for transferring file contents (de\n\
- fault true)\n\
+ \032-stream use a streaming protocol for transferring file contents (def\n\
+ ault true)\n\
\032-ui xxx select UI ('text' or 'graphic'); command-line only\n\
\032-unicode xxx assume Unicode encoding in case insensitive mode\n\
\032-xferbycopying optimize transfers using local copies (default true)\n\
\n\
+ \n\
\032 Here, in more detail, is what they do. Many are discussed in greater\n\
\032 detail in other sections of the manual.\n\
\032 addprefsto xxx\n\
\032 By default, new preferences added by Unison (e.g., new ignore\n\
- \032 clauses) will be appended to whatever preference file Unison\n\
- \032 was told to load at the beginning of the run. Setting the\n\
- \032 preference addprefsto filename makes Unison add new preferences\n\
- \032 to the file named filename instead.\n\
- \032 addversionno \n\
+ \032 clauses) will be appended to whatever preference file Unison was\n\
+ \032 told to load at the beginning of the run. Setting the preference\n\
+ \032 addprefsto filename makes Unison add new preferences to the file\n\
+ \032 named filename instead.\n\
+ \032 addversionno\n\
\032 When this flag is set to true, Unison will use\n\
- \032 unison-currentversionnumber instead of just unison as the\n\
- \032 remote server command. This allows multiple binaries for\n\
- \032 different versions of unison to coexist conveniently on the\n\
- \032 same server: whichever version is run on the client, the same\n\
- \032 version will be selected on the server.\n\
- \032 auto \n\
+ \032 unison-currentversionnumber instead of just unison as the remote\n\
+ \032 server command. This allows multiple binaries for different\n\
+ \032 versions of unison to coexist conveniently on the same server:\n\
+ \032 whichever version is run on the client, the same version will be\n\
+ \032 selected on the server.\n\
+ \032 auto\n\
\032 When set to true, this flag causes the user interface to skip\n\
\032 asking for confirmations on non-conflicting changes. (More\n\
\032 precisely, when the user interface is done setting the\n\
@@ -1282,22 +1275,22 @@
\032 backupcurrnot xxx\n\
\032 Exceptions to backupcurr, like the ignorenot preference.\n\
\032 backupdir xxx\n\
- \032 If this preference is set, Unison will use it as the name of\n\
- \032 the directory used to store backup files specified by the\n\
- \032 backup preference, when backuplocation is set to central. It is\n\
- \032 checked after the UNISONBACKUPDIR environment variable.\n\
+ \032 If this preference is set, Unison will use it as the name of the\n\
+ \032 directory used to store backup files specified by the backup\n\
+ \032 preference, when backuplocation is set to central. It is checked\n\
+ \032 after the UNISONBACKUPDIR environment variable.\n\
\032 backuploc xxx\n\
\032 This preference determines whether backups should be kept\n\
\032 locally, near the original files, or in a central directory\n\
\032 specified by the backupdir preference. If set to local, backups\n\
- \032 will be kept in the same directory as the original files, and\n\
- \032 if set to central, backupdir will be used instead.\n\
+ \032 will be kept in the same directory as the original files, and if\n\
+ \032 set to central, backupdir will be used instead.\n\
\032 backupnot xxx\n\
\032 The values of this preference specify paths or individual files\n\
- \032 or regular expressions that should not be backed up, even if\n\
- \032 the backup preference selects them--i.e., it selectively\n\
- \032 overrides backup. The same caveats apply here as with ignore\n\
- \032 and ignorenot.\n\
+ \032 or regular expressions that should not be backed up, even if the\n\
+ \032 backup preference selects them--i.e., it selectively overrides\n\
+ \032 backup. The same caveats apply here as with ignore and\n\
+ \032 ignorenot.\n\
\032 backupprefix xxx\n\
\032 When a backup for a file NAME is created, it is stored in a\n\
\032 directory specified by backuplocation, in a file called\n\
@@ -1316,59 +1309,58 @@
\032 prefix and suffix match backupprefix and backupsuffix. So be\n\
\032 careful to choose values for these preferences that are\n\
\032 sufficiently different from the names of your real files.\n\
- \032 backups \n\
+ \032 backups\n\
\032 Setting this flag to true is equivalent to setting\n\
\032 backuplocation to local and backup to Name *.\n\
\032 backupsuffix xxx\n\
\032 See backupprefix for full documentation.\n\
- \032 batch \n\
+ \032 batch\n\
\032 When this is set to true, the user interface will ask no\n\
\032 questions at all. Non-conflicting changes will be propagated;\n\
\032 conflicts will be skipped.\n\
- \032 confirmbigdel \n\
+ \032 confirmbigdel\n\
\032 When this is set to true, Unison will request an extra\n\
\032 confirmation if it appears that the entire replica has been\n\
\032 deleted, before propagating the change. If the batch flag is\n\
\032 also set, synchronization will be aborted. When the path\n\
\032 preference is used, the same confirmation will be requested for\n\
- \032 top-level paths. (At the moment, this flag only affects the\n\
- \032 text user interface.) See also the mountpoint preference.\n\
- \032 confirmmerge \n\
+ \032 top-level paths. (At the moment, this flag only affects the text\n\
+ \032 user interface.) See also the mountpoint preference.\n\
+ \032 confirmmerge\n\
\032 Setting this preference causes both the text and graphical\n\
- \032 interfaces to ask the user if the results of a merge command\n\
- \032 may be commited to the replica or not. Since the merge command\n\
- \032 works on temporary files, the user can then cancel all the\n\
- \032 effects of applying the merge if it turns out that the result\n\
- \032 is not satisfactory. In batch-mode, this preference has no\n\
- \032 effect. Default is false.\n\
- \032 contactquietly \n\
- \032 If this flag is set, Unison will skip displaying the\n\
- \032 `Contacting server' message (which some users find annoying)\n\
- \032 during startup.\n\
+ \032 interfaces to ask the user if the results of a merge command may\n\
+ \032 be commited to the replica or not. Since the merge command works\n\
+ \032 on temporary files, the user can then cancel all the effects of\n\
+ \032 applying the merge if it turns out that the result is not\n\
+ \032 satisfactory. In batch-mode, this preference has no effect.\n\
+ \032 Default is false.\n\
+ \032 contactquietly\n\
+ \032 If this flag is set, Unison will skip displaying the `Contacting\n\
+ \032 server' message (which some users find annoying) during startup.\n\
\032 copymax n\n\
\032 A number indicating how many instances of the external copying\n\
\032 utility Unison is allowed to run simultaneously (default to 1).\n\
\032 copyprog xxx\n\
- \032 A string giving the name of an external program that can be\n\
- \032 used to copy large files efficiently (plus command-line\n\
- \032 switches telling it to copy files in-place). The default\n\
- \032 setting invokes rsync with appropriate options--most users\n\
- \032 should not need to change it.\n\
+ \032 A string giving the name of an external program that can be used\n\
+ \032 to copy large files efficiently (plus command-line switches\n\
+ \032 telling it to copy files in-place). The default setting invokes\n\
+ \032 rsync with appropriate options--most users should not need to\n\
+ \032 change it.\n\
\032 copyprogrest xxx\n\
- \032 A variant of copyprog that names an external program that\n\
- \032 should be used to continue the transfer of a large file that\n\
- \032 has already been partially transferred. Typically, copyprogrest\n\
- \032 will just be copyprog with one extra option (e.g., -partial,\n\
- \032 for rsync). The default setting invokes rsync with appropriate\n\
+ \032 A variant of copyprog that names an external program that should\n\
+ \032 be used to continue the transfer of a large file that has\n\
+ \032 already been partially transferred. Typically, copyprogrest will\n\
+ \032 just be copyprog with one extra option (e.g., -partial, for\n\
+ \032 rsync). The default setting invokes rsync with appropriate\n\
\032 options--most users should not need to change it.\n\
\032 copyquoterem xxx\n\
\032 When set to true, this flag causes Unison to add an extra layer\n\
\032 of quotes to the remote path passed to the external copy\n\
\032 program. This is needed by rsync, for example, which internally\n\
\032 uses an ssh connection requiring an extra level of quoting for\n\
- \032 paths containing spaces. When this flag is set to default,\n\
- \032 extra quotes are added if the value of copyprog contains the\n\
- \032 string rsync.\n\
+ \032 paths containing spaces. When this flag is set to default, extra\n\
+ \032 quotes are added if the value of copyprog contains the string\n\
+ \032 rsync.\n\
\032 copythreshold n\n\
\032 A number indicating above what filesize (in kilobytes) Unison\n\
\032 should use the external copying utility specified by copyprog.\n\
@@ -1379,50 +1371,49 @@
\032 debug xxx\n\
\032 This preference is used to make Unison print various sorts of\n\
\032 information about what it is doing internally on the standard\n\
- \032 error stream. It can be used many times, each time with the\n\
- \032 name of a module for which debugging information should be\n\
- \032 printed. Possible arguments for debug can be found by looking\n\
- \032 for calls to Util.debug in the sources (using, e.g., grep).\n\
- \032 Setting -debug all causes information from all modules to be\n\
- \032 printed (this mode of usage is the first one to try, if you are\n\
- \032 trying to understand something that Unison seems to be doing\n\
- \032 wrong); -debug verbose turns on some additional debugging\n\
- \032 output from some modules (e.g., it will show exactly what bytes\n\
- \032 are being sent across the network).\n\
+ \032 error stream. It can be used many times, each time with the name\n\
+ \032 of a module for which debugging information should be printed.\n\
+ \032 Possible arguments for debug can be found by looking for calls\n\
+ \032 to Util.debug in the sources (using, e.g., grep). Setting -debug\n\
+ \032 all causes information from all modules to be printed (this mode\n\
+ \032 of usage is the first one to try, if you are trying to\n\
+ \032 understand something that Unison seems to be doing wrong);\n\
+ \032 -debug verbose turns on some additional debugging output from\n\
+ \032 some modules (e.g., it will show exactly what bytes are being\n\
+ \032 sent across the network).\n\
\032 diff xxx\n\
- \032 This preference can be used to control the name and\n\
- \032 command-line arguments of the system utility used to generate\n\
- \032 displays of file differences. The default is `diff -u CURRENT2\n\
- \032 CURRENT1'. If the value of this preference contains the\n\
- \032 substrings CURRENT1 and CURRENT2, these will be replaced by the\n\
- \032 names of the files to be diffed. If not, the two filenames will\n\
- \032 be appended to the command. In both cases, the filenames are\n\
- \032 suitably quoted.\n\
+ \032 This preference can be used to control the name and command-line\n\
+ \032 arguments of the system utility used to generate displays of\n\
+ \032 file differences. The default is `diff -u CURRENT2 CURRENT1'. If\n\
+ \032 the value of this preference contains the substrings CURRENT1\n\
+ \032 and CURRENT2, these will be replaced by the names of the files\n\
+ \032 to be diffed. If not, the two filenames will be appended to the\n\
+ \032 command. In both cases, the filenames are suitably quoted.\n\
\032 doc xxx\n\
\032 The command-line argument -doc secname causes unison to display\n\
\032 section secname of the manual on the standard output and then\n\
\032 exit. Use -doc all to display the whole manual, which includes\n\
\032 exactly the same information as the printed and HTML manuals,\n\
- \032 modulo formatting. Use -doc topics to obtain a list of the\n\
- \032 names of the various sections that can be printed.\n\
- \032 dontchmod \n\
+ \032 modulo formatting. Use -doc topics to obtain a list of the names\n\
+ \032 of the various sections that can be printed.\n\
+ \032 dontchmod\n\
\032 By default, Unison uses the 'chmod' system call to set the\n\
\032 permission bits of files after it has copied them. But in some\n\
- \032 circumstances (and under some operating systems), the chmod\n\
- \032 call always fails. Setting this preference completely prevents\n\
- \032 Unison from ever calling chmod.\n\
- \032 dumbtty \n\
+ \032 circumstances (and under some operating systems), the chmod call\n\
+ \032 always fails. Setting this preference completely prevents Unison\n\
+ \032 from ever calling chmod.\n\
+ \032 dumbtty\n\
\032 When set to true, this flag makes the text mode user interface\n\
\032 avoid trying to change any of the terminal settings. (Normally,\n\
- \032 Unison puts the terminal in `raw mode', so that it can do\n\
- \032 things like overwriting the current line.) This is useful, for\n\
- \032 example, when Unison runs in a shell inside of Emacs.\n\
+ \032 Unison puts the terminal in `raw mode', so that it can do things\n\
+ \032 like overwriting the current line.) This is useful, for example,\n\
+ \032 when Unison runs in a shell inside of Emacs.\n\
\032 When dumbtty is set, commands to the user interface need to be\n\
\032 followed by a carriage return before Unison will execute them.\n\
\032 (When it is off, Unison recognizes keystrokes as soon as they\n\
\032 are typed.)\n\
\032 This preference has no effect on the graphical user interface.\n\
- \032 dumparchives \n\
+ \032 dumparchives\n\
\032 When this preference is set, Unison will create a file\n\
\032 unison.dump on each host, containing a text summary of the\n\
\032 archive, immediately after loading it.\n\
@@ -1434,37 +1425,36 @@
\032 Unison to miss propagating an update if the modification time\n\
\032 and length of the file are both unchanged by the update.\n\
\032 However, Unison will never overwrite such an update with a\n\
- \032 change from the other replica, since it always does a safe\n\
- \032 check for updates just before propagating a change. Thus, it is\n\
- \032 reasonable to use this switch under Windows most of the time\n\
- \032 and occasionally run Unison once with fastcheck set to false,\n\
- \032 if you are worried that Unison may have overlooked an update.\n\
- \032 For backward compatibility, yes, no, and default can be used in\n\
+ \032 change from the other replica, since it always does a safe check\n\
+ \032 for updates just before propagating a change. Thus, it is\n\
+ \032 reasonable to use this switch under Windows most of the time and\n\
+ \032 occasionally run Unison once with fastcheck set to false, if you\n\
+ \032 are worried that Unison may have overlooked an update. For\n\
+ \032 backward compatibility, yes, no, and default can be used in\n\
\032 place of true, false, and auto. See the section \"Fast Checking\"\n\
\032 for more information.\n\
- \032 fat \n\
- \032 When this is set to true, Unison will use appropriate options\n\
- \032 to synchronize efficiently and without error a replica located\n\
- \032 on a FAT filesystem on a non-Windows machine: do not\n\
- \032 synchronize permissions (perms = 0); never use chmod ( t\n\
- \032 dontchmod = true); treat filenames as case insensitive\n\
- \032 (ignorecase = true); do not attempt to synchronize symbolic\n\
- \032 links (links = false); ignore inode number changes when\n\
- \032 detecting updates (ignoreinodenumbers = true). Any of these\n\
- \032 change can be overridden by explicitely setting the\n\
- \032 corresponding preference in the profile.\n\
+ \032 fat\n\
+ \032 When this is set to true, Unison will use appropriate options to\n\
+ \032 synchronize efficiently and without error a replica located on a\n\
+ \032 FAT filesystem on a non-Windows machine: do not synchronize\n\
+ \032 permissions (perms = 0); never use chmod ( t dontchmod = true);\n\
+ \032 treat filenames as case insensitive (ignorecase = true); do not\n\
+ \032 attempt to synchronize symbolic links (links = false); ignore\n\
+ \032 inode number changes when detecting updates (ignoreinodenumbers\n\
+ \032 = true). Any of these change can be overridden by explicitely\n\
+ \032 setting the corresponding preference in the profile.\n\
\032 follow xxx\n\
- \032 Including the preference -follow pathspec causes Unison to\n\
- \032 treat symbolic links matching pathspec as `invisible' and\n\
- \032 behave as if the object pointed to by the link had appeared\n\
- \032 literally at this position in the replica. See the section\n\
- \032 \"Symbolic Links\" for more details. The syntax of pathspec is\n\
- \032 described in the section \"Path Specification\" .\n\
+ \032 Including the preference -follow pathspec causes Unison to treat\n\
+ \032 symbolic links matching pathspec as `invisible' and behave as if\n\
+ \032 the object pointed to by the link had appeared literally at this\n\
+ \032 position in the replica. See the section \"Symbolic Links\" for\n\
+ \032 more details. The syntax of pathspec is described in the section\n\
+ \032 \"Path Specification\" .\n\
\032 force xxx\n\
\032 Including the preference -force root causes Unison to resolve\n\
- \032 all differences (even non-conflicting changes) in favor of\n\
- \032 root. This effectively changes Unison from a synchronizer into\n\
- \032 a mirroring utility.\n\
+ \032 all differences (even non-conflicting changes) in favor of root.\n\
+ \032 This effectively changes Unison from a synchronizer into a\n\
+ \032 mirroring utility.\n\
\032 You can also specify -force newer (or -force older) to force\n\
\032 Unison to choose the file with the later (earlier) modtime. In\n\
\032 this case, the -times preference must also be enabled.\n\
@@ -1473,30 +1463,28 @@
\032 what you are doing!\n\
\032 forcepartial xxx\n\
\032 Including the preference forcepartial = PATHSPEC -> root causes\n\
- \032 Unison to resolve all differences (even non-conflicting\n\
- \032 changes) in favor of root for the files in PATHSPEC (see the\n\
- \032 section \"Path Specification\" for more information). This\n\
- \032 effectively changes Unison from a synchronizer into a mirroring\n\
- \032 utility.\n\
+ \032 Unison to resolve all differences (even non-conflicting changes)\n\
+ \032 in favor of root for the files in PATHSPEC (see the section\n\
+ \032 \"Path Specification\" for more information). This effectively\n\
+ \032 changes Unison from a synchronizer into a mirroring utility.\n\
\032 You can also specify forcepartial PATHSPEC -> newer (or\n\
\032 forcepartial PATHSPEC older) to force Unison to choose the file\n\
\032 with the later (earlier) modtime. In this case, the -times\n\
\032 preference must also be enabled.\n\
\032 This preference should be used only if you are sure you know\n\
\032 what you are doing!\n\
- \032 group \n\
- \032 When this flag is set to true, the group attributes of the\n\
- \032 files are synchronized. Whether the group names or the group\n\
- \032 identifiers are synchronized depends on the preference\n\
- \032 numerids.\n\
- \032 halfduplex \n\
+ \032 group\n\
+ \032 When this flag is set to true, the group attributes of the files\n\
+ \032 are synchronized. Whether the group names or the group\n\
+ \032 identifiers are synchronized depends on the preference numerids.\n\
+ \032 halfduplex\n\
\032 When this flag is set to true, Unison network communication is\n\
\032 forced to be half duplex (the client and the server never\n\
\032 simultaneously emit data). If you experience unstabilities with\n\
\032 your network link, this may help. The communication is always\n\
\032 half-duplex when synchronizing with a Windows machine due to a\n\
- \032 limitation of Unison current implementation that could result\n\
- \032 in a deadlock.\n\
+ \032 limitation of Unison current implementation that could result in\n\
+ \032 a deadlock.\n\
\032 height n\n\
\032 Used to set the height (in lines) of the main window in the\n\
\032 graphical user interface.\n\
@@ -1504,10 +1492,10 @@
\032 Including the preference -ignore pathspec causes Unison to\n\
\032 completely ignore paths that match pathspec (as well as their\n\
\032 children). This is useful for avoiding synchronizing temporary\n\
- \032 files, object files, etc. The syntax of pathspec is described\n\
- \032 in the section \"Path Specification\" , and further details on\n\
+ \032 files, object files, etc. The syntax of pathspec is described in\n\
+ \032 the section \"Path Specification\" , and further details on\n\
\032 ignoring paths is found in the section \"Ignoring Paths\" .\n\
- \032 ignorearchives \n\
+ \032 ignorearchives\n\
\032 When this preference is set, Unison will ignore any existing\n\
\032 archive files and behave as though it were being run for the\n\
\032 first time on these replicas. It is not a good idea to set this\n\
@@ -1517,17 +1505,17 @@
\032 case insensitive--i.e., files in the two replicas whose names\n\
\032 differ in (upper- and lower-case) `spelling' are treated as the\n\
\032 same file. When the flag is set to false, Unison will treat all\n\
- \032 filenames as case sensitive. Ordinarily, when the flag is set\n\
- \032 to default, filenames are automatically taken to be\n\
+ \032 filenames as case sensitive. Ordinarily, when the flag is set to\n\
+ \032 default, filenames are automatically taken to be\n\
\032 case-insensitive if either host is running Windows or OSX. In\n\
\032 rare circumstances it may be useful to set the flag manually.\n\
- \032 ignoreinodenumbers \n\
+ \032 ignoreinodenumbers\n\
\032 When set to true, this preference makes Unison not take\n\
\032 advantage of inode numbers during fast update detection. This\n\
\032 switch should be used with care, as it is less safe than the\n\
\032 standard update detection method, but it can be useful with\n\
\032 filesystems which do not support inode numbers.\n\
- \032 ignorelocks \n\
+ \032 ignorelocks\n\
\032 When this preference is set, Unison will ignore any lock files\n\
\032 that may have been left over from a previous run of Unison that\n\
\032 was interrupted while reading or writing archive files; by\n\
@@ -1540,23 +1528,22 @@
\032 idea to set this option in a profile: it is intended for\n\
\032 command-line use.\n\
\032 ignorenot xxx\n\
- \032 This preference overrides the preference ignore. It gives a\n\
- \032 list of patterns (in the same format as ignore) for paths that\n\
- \032 should definitely not be ignored, whether or not they happen to\n\
- \032 match one of the ignore patterns.\n\
+ \032 This preference overrides the preference ignore. It gives a list\n\
+ \032 of patterns (in the same format as ignore) for paths that should\n\
+ \032 definitely not be ignored, whether or not they happen to match\n\
+ \032 one of the ignore patterns.\n\
\032 Note that the semantics of ignore and ignorenot is a little\n\
- \032 counter-intuitive. When detecting updates, Unison examines\n\
- \032 paths in depth-first order, starting from the roots of the\n\
- \032 replicas and working downwards. Before examining each path, it\n\
- \032 checks whether it matches ignore and does not match ignorenot;\n\
- \032 in this case it skips this path and all its descendants. This\n\
- \032 means that, if some parent of a given path matches an ignore\n\
- \032 pattern, then it will be skipped even if the path itself\n\
- \032 matches an ignorenot pattern. In particular, putting ignore =\n\
- \032 Path * in your profile and then using ignorenot to select\n\
- \032 particular paths to be synchronized will not work. Instead, you\n\
- \032 should use the path preference to choose particular paths to\n\
- \032 synchronize.\n\
+ \032 counter-intuitive. When detecting updates, Unison examines paths\n\
+ \032 in depth-first order, starting from the roots of the replicas\n\
+ \032 and working downwards. Before examining each path, it checks\n\
+ \032 whether it matches ignore and does not match ignorenot; in this\n\
+ \032 case it skips this path and all its descendants. This means\n\
+ \032 that, if some parent of a given path matches an ignore pattern,\n\
+ \032 then it will be skipped even if the path itself matches an\n\
+ \032 ignorenot pattern. In particular, putting ignore = Path * in\n\
+ \032 your profile and then using ignorenot to select particular paths\n\
+ \032 to be synchronized will not work. Instead, you should use the\n\
+ \032 path preference to choose particular paths to synchronize.\n\
\032 immutable xxx\n\
\032 This preference specifies paths for directories whose immediate\n\
\032 children are all immutable files -- i.e., once a file has been\n\
@@ -1567,18 +1554,18 @@
\032 immutablenot xxx\n\
\032 This preference overrides immutable.\n\
\032 key xxx\n\
- \032 Used in a profile to define a numeric key (0-9) that can be\n\
- \032 used in the graphical user interface to switch immediately to\n\
- \032 this profile.\n\
- \032 killserver \n\
+ \032 Used in a profile to define a numeric key (0-9) that can be used\n\
+ \032 in the graphical user interface to switch immediately to this\n\
+ \032 profile.\n\
+ \032 killserver\n\
\032 When set to true, this flag causes Unison to kill the remote\n\
\032 server process when the synchronization is finished. This\n\
\032 behavior is the default for ssh connections, so this preference\n\
\032 is not normally needed when running over ssh; it is provided so\n\
- \032 that socket-mode servers can be killed off after a single run\n\
- \032 of Unison, rather than waiting to accept future connections.\n\
- \032 (Some users prefer to start a remote socket server for each run\n\
- \032 of Unison, rather than leaving one running all the time.)\n\
+ \032 that socket-mode servers can be killed off after a single run of\n\
+ \032 Unison, rather than waiting to accept future connections. (Some\n\
+ \032 users prefer to start a remote socket server for each run of\n\
+ \032 Unison, rather than leaving one running all the time.)\n\
\032 label xxx\n\
\032 Used in a profile to provide a descriptive string documenting\n\
\032 its settings. (This is useful for users that switch between\n\
@@ -1588,11 +1575,10 @@
\032 When set to true, this flag causes Unison to synchronize\n\
\032 symbolic links. When the flag is set to false, symbolic links\n\
\032 will result in an error during update detection. Ordinarily,\n\
- \032 when the flag is set to default, symbolic links are\n\
- \032 synchronized except when one of the hosts is running Windows.\n\
- \032 In rare circumstances it may be useful to set the flag\n\
- \032 manually.\n\
- \032 log \n\
+ \032 when the flag is set to default, symbolic links are synchronized\n\
+ \032 except when one of the hosts is running Windows. In rare\n\
+ \032 circumstances it may be useful to set the flag manually.\n\
+ \032 log\n\
\032 When this flag is set, Unison will log all changes to the\n\
\032 filesystems on a file.\n\
\032 logfile xxx\n\
@@ -1601,8 +1587,8 @@
\032 prefer another file.\n\
\032 maxbackups n\n\
\032 This preference specifies the number of backup versions that\n\
- \032 will be kept by unison, for each path that matches the\n\
- \032 predicate backup. The default is 2.\n\
+ \032 will be kept by unison, for each path that matches the predicate\n\
+ \032 backup. The default is 2.\n\
\032 maxerrors n\n\
\032 This preference controls after how many errors Unison aborts a\n\
\032 directory transfer. Setting it to a large number allows Unison\n\
@@ -1614,18 +1600,18 @@
\032 This preference controls how much concurrency is allowed during\n\
\032 the transport phase. Normally, it should be set reasonably high\n\
\032 to maximize performance, but when Unison is used over a\n\
- \032 low-bandwidth link it may be helpful to set it lower (e.g. to\n\
- \032 1) so that Unison doesn't soak up all the available bandwidth.\n\
- \032 The default is the special value 0, which mean 20 threads when\n\
- \032 file content streaming is desactivated and 1000 threads when it\n\
- \032 is activated.\n\
+ \032 low-bandwidth link it may be helpful to set it lower (e.g. to 1)\n\
+ \032 so that Unison doesn't soak up all the available bandwidth. The\n\
+ \032 default is the special value 0, which mean 20 threads when file\n\
+ \032 content streaming is desactivated and 1000 threads when it is\n\
+ \032 activated.\n\
\032 merge xxx\n\
\032 This preference can be used to run a merge program which will\n\
\032 create a new version for each of the files and the backup, with\n\
\032 the last backup and the both replicas. Setting the merge\n\
- \032 preference for a path will also cause this path to be backed\n\
- \032 up, just like t backup. The syntax of pathspec>cmd is described\n\
- \032 in the section \"Path Specification\" , and further details on\n\
+ \032 preference for a path will also cause this path to be backed up,\n\
+ \032 just like t backup. The syntax of pathspec>cmd is described in\n\
+ \032 the section \"Path Specification\" , and further details on\n\
\032 Merging functions are present in the section \"Merging files\" .\n\
\032 mountpoint xxx\n\
\032 Including the preference -mountpoint PATH causes Unison to\n\
@@ -1640,19 +1626,19 @@
\032 you want to prevent any creation.\n\
\032 nocreationpartial xxx\n\
\032 Including the preference nocreationpartial = PATHSPEC -> root\n\
- \032 prevents Unison from performing any file creation in PATHSPEC\n\
- \032 on root root (see the section \"Path Specification\" for more\n\
+ \032 prevents Unison from performing any file creation in PATHSPEC on\n\
+ \032 root root (see the section \"Path Specification\" for more\n\
\032 information). It is recommended to use BelowPath patterns when\n\
\032 selecting a directory and all its contents.\n\
\032 nodeletion xxx\n\
\032 Including the preference -nodeletion root prevents Unison from\n\
\032 performing any file deletion on root root.\n\
\032 This preference can be included twice, once for each root, if\n\
- \032 you want to prevent any creation.\n\
+ \032 you want to prevent any deletion.\n\
\032 nodeletionpartial xxx\n\
\032 Including the preference nodeletionpartial = PATHSPEC -> root\n\
- \032 prevents Unison from performing any file deletion in PATHSPEC\n\
- \032 on root root (see the section \"Path Specification\" for more\n\
+ \032 prevents Unison from performing any file deletion in PATHSPEC on\n\
+ \032 root root (see the section \"Path Specification\" for more\n\
\032 information). It is recommended to use BelowPath patterns when\n\
\032 selecting a directory and all its contents.\n\
\032 noupdate xxx\n\
@@ -1666,34 +1652,34 @@
\032 PATHSPEC on root root (see the section \"Path Specification\" for\n\
\032 more information). It is recommended to use BelowPath patterns\n\
\032 when selecting a directory and all its contents.\n\
- \032 numericids \n\
- \032 When this flag is set to true, groups and users are\n\
- \032 synchronized numerically, rather than by name.\n\
+ \032 numericids\n\
+ \032 When this flag is set to true, groups and users are synchronized\n\
+ \032 numerically, rather than by name.\n\
\032 The special uid 0 and the special group 0 are never mapped via\n\
\032 user/group names even if this preference is not set.\n\
- \032 owner \n\
- \032 When this flag is set to true, the owner attributes of the\n\
- \032 files are synchronized. Whether the owner names or the owner\n\
+ \032 owner\n\
+ \032 When this flag is set to true, the owner attributes of the files\n\
+ \032 are synchronized. Whether the owner names or the owner\n\
\032 identifiers are synchronizeddepends on the preference numerids.\n\
\032 path xxx\n\
- \032 When no path preference is given, Unison will simply\n\
- \032 synchronize the two entire replicas, beginning from the given\n\
- \032 pair of roots. If one or more path preferences are given, then\n\
- \032 Unison will synchronize only these paths and their children.\n\
- \032 (This is useful for doing a fast sync of just one directory,\n\
- \032 for example.) Note that path preferences are intepreted\n\
- \032 literally--they are not regular expressions.\n\
+ \032 When no path preference is given, Unison will simply synchronize\n\
+ \032 the two entire replicas, beginning from the given pair of roots.\n\
+ \032 If one or more path preferences are given, then Unison will\n\
+ \032 synchronize only these paths and their children. (This is useful\n\
+ \032 for doing a fast sync of just one directory, for example.) Note\n\
+ \032 that path preferences are intepreted literally--they are not\n\
+ \032 regular expressions.\n\
\032 perms n\n\
\032 The integer value of this preference is a mask indicating which\n\
\032 permission bits should be synchronized. It is set by default to\n\
\032 0o1777: all bits but the set-uid and set-gid bits are\n\
- \032 synchronised (synchronizing theses latter bits can be a\n\
- \032 security hazard). If you want to synchronize all bits, you can\n\
- \032 set the value of this preference to -1. If one of the replica\n\
- \032 is on a FAT [Windows] filesystem, you should consider using the\n\
- \032 t fat preference instead of this preference. If you need Unison\n\
- \032 not to set permissions at all, set the value of this preference\n\
- \032 to 0 and set the preference t dontchmod to t true.\n\
+ \032 synchronised (synchronizing theses latter bits can be a security\n\
+ \032 hazard). If you want to synchronize all bits, you can set the\n\
+ \032 value of this preference to -1. If one of the replica is on a\n\
+ \032 FAT [Windows] filesystem, you should consider using the t fat\n\
+ \032 preference instead of this preference. If you need Unison not to\n\
+ \032 set permissions at all, set the value of this preference to 0\n\
+ \032 and set the preference t dontchmod to t true.\n\
\032 prefer xxx\n\
\032 Including the preference -prefer root causes Unison always to\n\
\032 resolve conflicts in favor of root, rather than asking for\n\
@@ -1703,12 +1689,12 @@
\032 This preference should be used only if you are sure you know\n\
\032 what you are doing!\n\
\032 preferpartial xxx\n\
- \032 Including the preference preferpartial = PATHSPEC -> root\n\
- \032 causes Unison always to resolve conflicts in favor of root,\n\
- \032 rather than asking for guidance from the user, for the files in\n\
- \032 PATHSPEC (see the section \"Path Specification\" for more\n\
- \032 information). (The syntax of root is the same as for the root\n\
- \032 preference, plus the special values newer and older.)\n\
+ \032 Including the preference preferpartial = PATHSPEC -> root causes\n\
+ \032 Unison always to resolve conflicts in favor of root, rather than\n\
+ \032 asking for guidance from the user, for the files in PATHSPEC\n\
+ \032 (see the section \"Path Specification\" for more information).\n\
+ \032 (The syntax of root is the same as for the root preference, plus\n\
+ \032 the special values newer and older.)\n\
\032 This preference should be used only if you are sure you know\n\
\032 what you are doing!\n\
\032 repeat xxx\n\
@@ -1724,9 +1710,9 @@
\032 Each use of this preference names the root of one of the\n\
\032 replicas for Unison to synchronize. Exactly two roots are\n\
\032 needed, so normal modes of usage are either to give two values\n\
- \032 for root in the profile, or to give no values in the profile\n\
- \032 and provide two on the command line. Details of the syntax of\n\
- \032 roots can be found in the section \"Roots\" .\n\
+ \032 for root in the profile, or to give no values in the profile and\n\
+ \032 provide two on the command line. Details of the syntax of roots\n\
+ \032 can be found in the section \"Roots\" .\n\
\032 The two roots can be given in either order; Unison will sort\n\
\032 them into a canonical order before doing anything else. It also\n\
\032 tries to `canonize' the machine names and paths that appear in\n\
@@ -1738,10 +1724,10 @@
\032 of roots, Unison replaces any roots matching the left-hand side\n\
\032 of any rootalias rule by the corresponding right-hand side.\n\
\032 rshargs xxx\n\
- \032 The string value of this preference will be passed as\n\
- \032 additional arguments (besides the host name and the name of the\n\
- \032 Unison executable on the remote system) to the rsh command used\n\
- \032 to invoke the remote server.\n\
+ \032 The string value of this preference will be passed as additional\n\
+ \032 arguments (besides the host name and the name of the Unison\n\
+ \032 executable on the remote system) to the rsh command used to\n\
+ \032 invoke the remote server.\n\
\032 rshcmd xxx\n\
\032 This preference can be used to explicitly set the name of the\n\
\032 rsh executable (e.g., giving a full path name), if necessary.\n\
@@ -1754,49 +1740,48 @@
\032 flag is set to default, and these data are automatically\n\
\032 synchronized if either host is running OSX. In rare\n\
\032 circumstances it is useful to set the flag manually.\n\
- \032 rsync \n\
+ \032 rsync\n\
\032 Unison uses the 'rsync algorithm' for 'diffs-only' transfer of\n\
\032 updates to large files. Setting this flag to false makes Unison\n\
\032 use whole-file transfers instead. Under normal circumstances,\n\
\032 there is no reason to do this, but if you are having trouble\n\
- \032 with repeated 'rsync failure' errors, setting it to false\n\
- \032 should permit you to synchronize the offending files.\n\
- \032 selftest \n\
+ \032 with repeated 'rsync failure' errors, setting it to false should\n\
+ \032 permit you to synchronize the offending files.\n\
+ \032 selftest\n\
\032 Run internal tests and exit. This option is mostly for\n\
\032 developers and must be used carefully: in particular, it will\n\
\032 delete the contents of both roots, so that it can install its\n\
- \032 own files for testing. This flag only makes sense on the\n\
- \032 command line. When it is provided, no preference file is read:\n\
- \032 all preferences must be specified on thecommand line. Also,\n\
- \032 since the self-test procedure involves overwriting the roots\n\
- \032 and backup directory, the names of the roots and of the\n\
- \032 backupdir preference must include the string \"test\" or else the\n\
- \032 tests will be aborted. (If these are not given on the command\n\
- \032 line, dummy subdirectories in the current directory will be\n\
- \032 created automatically.)\n\
+ \032 own files for testing. This flag only makes sense on the command\n\
+ \032 line. When it is provided, no preference file is read: all\n\
+ \032 preferences must be specified on thecommand line. Also, since\n\
+ \032 the self-test procedure involves overwriting the roots and\n\
+ \032 backup directory, the names of the roots and of the backupdir\n\
+ \032 preference must include the string \"test\" or else the tests will\n\
+ \032 be aborted. (If these are not given on the command line, dummy\n\
+ \032 subdirectories in the current directory will be created\n\
+ \032 automatically.)\n\
\032 servercmd xxx\n\
\032 This preference can be used to explicitly set the name of the\n\
- \032 Unison executable on the remote server (e.g., giving a full\n\
- \032 path name), if necessary.\n\
- \032 showarchive \n\
+ \032 Unison executable on the remote server (e.g., giving a full path\n\
+ \032 name), if necessary.\n\
+ \032 showarchive\n\
\032 When this preference is set, Unison will print out the 'true\n\
\032 names'of the roots, in the same form as is expected by the\n\
\032 rootaliaspreference.\n\
- \032 silent \n\
+ \032 silent\n\
\032 When this preference is set to true, the textual user interface\n\
- \032 will print nothing at all, except in the case of errors.\n\
- \032 Setting silent to true automatically sets the batch preference\n\
- \032 to true.\n\
- \032 sortbysize \n\
+ \032 will print nothing at all, except in the case of errors. Setting\n\
+ \032 silent to true automatically sets the batch preference to true.\n\
+ \032 sortbysize\n\
\032 When this flag is set, the user interface will list changed\n\
\032 files by size (smallest first) rather than by name. This is\n\
- \032 useful, for example, for synchronizing over slow links, since\n\
- \032 it puts very large files at the end of the list where they will\n\
- \032 not prevent smaller files from being transferred quickly.\n\
- \032 This preference (as well as the other sorting flags, but not\n\
- \032 the sorting preferences that require patterns as arguments) can\n\
- \032 be set interactively and temporarily using the 'Sort' menu in\n\
- \032 the graphical user interface.\n\
+ \032 useful, for example, for synchronizing over slow links, since it\n\
+ \032 puts very large files at the end of the list where they will not\n\
+ \032 prevent smaller files from being transferred quickly.\n\
+ \032 This preference (as well as the other sorting flags, but not the\n\
+ \032 sorting preferences that require patterns as arguments) can be\n\
+ \032 set interactively and temporarily using the 'Sort' menu in the\n\
+ \032 graphical user interface.\n\
\032 sortfirst xxx\n\
\032 Each argument to sortfirst is a pattern pathspec, which\n\
\032 describes a set of paths. Files matching any of these patterns\n\
@@ -1805,17 +1790,16 @@
\032 sortlast xxx\n\
\032 Similar to sortfirst, except that files matching one of these\n\
\032 patterns will be listed at the very end.\n\
- \032 sortnewfirst \n\
+ \032 sortnewfirst\n\
\032 When this flag is set, the user interface will list newly\n\
\032 created files before all others. This is useful, for example,\n\
- \032 for checking that newly created files are not `junk', i.e.,\n\
- \032 ones that should be ignored or deleted rather than\n\
- \032 synchronized.\n\
+ \032 for checking that newly created files are not `junk', i.e., ones\n\
+ \032 that should be ignored or deleted rather than synchronized.\n\
\032 sshargs xxx\n\
- \032 The string value of this preference will be passed as\n\
- \032 additional arguments (besides the host name and the name of the\n\
- \032 Unison executable on the remote system) to the ssh command used\n\
- \032 to invoke the remote server.\n\
+ \032 The string value of this preference will be passed as additional\n\
+ \032 arguments (besides the host name and the name of the Unison\n\
+ \032 executable on the remote system) to the ssh command used to\n\
+ \032 invoke the remote server.\n\
\032 sshcmd xxx\n\
\032 This preference can be used to explicitly set the name of the\n\
\032 ssh executable (e.g., giving a full path name), if necessary.\n\
@@ -1826,44 +1810,44 @@
\032 just ssh to invoke ssh. The default value is empty, which will\n\
\032 make unison use whatever version of ssh is installed as the\n\
\032 default `ssh' command.\n\
- \032 stream \n\
+ \032 stream\n\
\032 When this preference is set, Unison will use an experimental\n\
\032 streaming protocol for transferring file contents more\n\
\032 efficiently. The default value is true.\n\
- \032 terse \n\
- \032 When this preference is set to true, the user interface will\n\
- \032 not print status messages.\n\
- \032 testserver \n\
+ \032 terse\n\
+ \032 When this preference is set to true, the user interface will not\n\
+ \032 print status messages.\n\
+ \032 testserver\n\
\032 Setting this flag on the command line causes Unison to attempt\n\
\032 to connect to the remote server and, if successful, print a\n\
\032 message and immediately exit. Useful for debugging installation\n\
\032 problems. Should not be set in preference files.\n\
- \032 times \n\
+ \032 times\n\
\032 When this flag is set to true, file modification times (but not\n\
\032 directory modtimes) are propagated.\n\
\032 ui xxx\n\
- \032 This preference selects either the graphical or the textual\n\
- \032 user interface. Legal values are graphic or text.\n\
+ \032 This preference selects either the graphical or the textual user\n\
+ \032 interface. Legal values are graphic or text.\n\
\032 Because this option is processed specially during Unison's\n\
\032 start-up sequence, it can only be used on the command line. In\n\
\032 preference files it has no effect.\n\
\032 If the Unison executable was compiled with only a textual\n\
- \032 interface, this option has no effect. (The pre-compiled\n\
- \032 binaries are all compiled with both interfaces available.)\n\
+ \032 interface, this option has no effect. (The pre-compiled binaries\n\
+ \032 are all compiled with both interfaces available.)\n\
\032 unicode xxx\n\
\032 When set to true, this flag causes Unison to perform case\n\
\032 insensitive file comparisons assuming Unicode encoding. This is\n\
\032 the default. When the flag is set to false, a Latin 1 encoding\n\
\032 is assumed. When Unison runs in case sensitive mode, this flag\n\
- \032 only makes a difference if one host is running Windows or Mac\n\
- \032 OS X. Under Windows, the flag selects between using the Unicode\n\
- \032 or 8bit Windows API for accessing the filesystem. Under Mac OS\n\
- \032 X, it selects whether comparing the filenames up to\n\
- \032 decomposition, or byte-for-byte.\n\
- \032 version \n\
+ \032 only makes a difference if one host is running Windows or Mac OS\n\
+ \032 X. Under Windows, the flag selects between using the Unicode or\n\
+ \032 8bit Windows API for accessing the filesystem. Under Mac OS X,\n\
+ \032 it selects whether comparing the filenames up to decomposition,\n\
+ \032 or byte-for-byte.\n\
+ \032 version\n\
\032 Print the current version number and exit. (This option only\n\
\032 makes sense on the command line.)\n\
- \032 xferbycopying \n\
+ \032 xferbycopying\n\
\032 When this preference is set, Unison will try to avoid\n\
\032 transferring file contents across the network by recognizing\n\
\032 when a file with the required contents already exists in the\n\
@@ -1873,16 +1857,16 @@
Profiles\n\
\n\
\032 A profile is a text file that specifies permanent settings for roots,\n\
- \032 paths, ignore patterns, and other preferences, so that they do not\n\
- \032 need to be typed at the command line every time Unison is run.\n\
- \032 Profiles should reside in the .unison directory on the client machine.\n\
- \032 If Unison is started with just one argument name on the command line,\n\
- \032 it looks for a profile called name.prf in the .unison directory. If it\n\
- \032 is started with no arguments, it scans the .unison directory for files\n\
+ \032 paths, ignore patterns, and other preferences, so that they do not need\n\
+ \032 to be typed at the command line every time Unison is run. Profiles\n\
+ \032 should reside in the .unison directory on the client machine. If Unison\n\
+ \032 is started with just one argument name on the command line, it looks\n\
+ \032 for a profile called name.prf in the .unison directory. If it is\n\
+ \032 started with no arguments, it scans the .unison directory for files\n\
\032 whose names end in .prf and offers a menu (provided that the Unison\n\
\032 executable is compiled with the graphical user interface). If a file\n\
- \032 named default.prf is found, its settings will be offered as the\n\
- \032 default choices.\n\
+ \032 named default.prf is found, its settings will be offered as the default\n\
+ \032 choices.\n\
\n\
\032 To set the value of a preference p permanently, add to the appropriate\n\
\032 profile a line of the form\n\
@@ -1900,25 +1884,24 @@
\032 line, so command-line options will override settings from the profile.\n\
\n\
\032 Profiles may also include lines of the form include name, which will\n\
- \032 cause the file name (or name.prf, if name does not exist in the\n\
- \032 .unison directory) to be read at the point, and included as if its\n\
- \032 contents, instead of the include line, was part of the profile.\n\
- \032 Include lines allows settings common to several profiles to be stored\n\
- \032 in one place.\n\
+ \032 cause the file name (or name.prf, if name does not exist in the .unison\n\
+ \032 directory) to be read at the point, and included as if its contents,\n\
+ \032 instead of the include line, was part of the profile. Include lines\n\
+ \032 allows settings common to several profiles to be stored in one place.\n\
\n\
\032 A profile may include a preference `label = desc' to provide a\n\
- \032 description of the options selected in this profile. The string desc\n\
- \032 is listed along with the profile name in the profile selection dialog,\n\
- \032 and displayed in the top-right corner of the main Unison window in the\n\
+ \032 description of the options selected in this profile. The string desc is\n\
+ \032 listed along with the profile name in the profile selection dialog, and\n\
+ \032 displayed in the top-right corner of the main Unison window in the\n\
\032 graphical user interface.\n\
\n\
\032 The graphical user-interface also supports one-key shortcuts for\n\
\032 commonly used profiles. If a profile contains a preference of the form\n\
- \032 `key = n', where n is a single digit, then pressing this digit key\n\
- \032 will cause Unison to immediately switch to this profile and begin\n\
- \032 synchronization again from scratch. In this case, all actions that\n\
- \032 have been selected for a set of changes currently being displayed will\n\
- \032 be discarded.\n\
+ \032 `key = n', where n is a single digit, then pressing this digit key will\n\
+ \032 cause Unison to immediately switch to this profile and begin\n\
+ \032 synchronization again from scratch. In this case, all actions that have\n\
+ \032 been selected for a set of changes currently being displayed will be\n\
+ \032 discarded.\n\
\n\
Sample Profiles\n\
\n\
@@ -1977,15 +1960,14 @@
\032 When Unison is used with large replicas, it is often convenient to be\n\
\032 able to synchronize just a part of the replicas on a given run (this\n\
\032 saves the time of detecting updates in the other parts). This can be\n\
- \032 accomplished by splitting up the profile into several parts -- a\n\
- \032 common part containing most of the preference settings, plus one\n\
- \032 \"top-level\" file for each set of paths that need to be synchronized.\n\
- \032 (The include mechanism can also be used to allow the same set of\n\
- \032 preference settings to be used with different roots.)\n\
+ \032 accomplished by splitting up the profile into several parts -- a common\n\
+ \032 part containing most of the preference settings, plus one \"top-level\"\n\
+ \032 file for each set of paths that need to be synchronized. (The include\n\
+ \032 mechanism can also be used to allow the same set of preference settings\n\
+ \032 to be used with different roots.)\n\
\n\
\032 The collection of profiles implementing this scheme might look as\n\
- \032 follows. The file default.prf is empty except for an include\n\
- \032 directive:\n\
+ \032 follows. The file default.prf is empty except for an include directive:\n\
\032 # Include the contents of the file common\n\
\032 include common\n\
\n\
@@ -2014,11 +1996,11 @@
\032 ignore = Name *.tmp\n\
\n\
\032 Note that there are no path preferences in common. This means that,\n\
- \032 when we invoke Unison with the default profile (e.g., by typing\n\
- \032 'unison default' or just 'unison' on the command line), the whole\n\
- \032 replicas will be synchronized. (If we never want to synchronize the\n\
- \032 whole replicas, then default.prf would instead include settings for\n\
- \032 all the paths that are usually synchronized.)\n\
+ \032 when we invoke Unison with the default profile (e.g., by typing 'unison\n\
+ \032 default' or just 'unison' on the command line), the whole replicas will\n\
+ \032 be synchronized. (If we never want to synchronize the whole replicas,\n\
+ \032 then default.prf would instead include settings for all the paths that\n\
+ \032 are usually synchronized.)\n\
\n\
\032 To synchronize just part of the replicas, Unison is invoked with an\n\
\032 alternate preference file--e.g., doing 'unison workingset', where the\n\
@@ -2044,10 +2026,10 @@
\n\
Keeping Backups\n\
\n\
- \032 When Unison overwrites a file or directory by propagating a new\n\
- \032 version from the other replica, it can keep the old version around as\n\
- \032 a backup. There are several preferences that control precisely where\n\
- \032 these backups are stored and how they are named.\n\
+ \032 When Unison overwrites a file or directory by propagating a new version\n\
+ \032 from the other replica, it can keep the old version around as a backup.\n\
+ \032 There are several preferences that control precisely where these\n\
+ \032 backups are stored and how they are named.\n\
\n\
\032 To enable backups, you must give one or more backup preferences. Each\n\
\032 of these has the form\n\
@@ -2058,25 +2040,25 @@
\032 backup = Name *\n\
\n\
\032 causes Unison to keep backups of all files and directories. The\n\
- \032 backupnot preference can be used to give a few exceptions: it\n\
- \032 specifies which files and directories should not be backed up, even if\n\
- \032 they match the backup pathspec.\n\
+ \032 backupnot preference can be used to give a few exceptions: it specifies\n\
+ \032 which files and directories should not be backed up, even if they match\n\
+ \032 the backup pathspec.\n\
\n\
\032 It is important to note that the pathspec is matched against the path\n\
\032 that is being updated by Unison, not its descendants. For example, if\n\
- \032 you set backup = Name *.txt and then delete a whole directory named\n\
- \032 foo containing some text files, these files will not be backed up\n\
- \032 because Unison will just check that foo does not match *.txt.\n\
- \032 Similarly, if the directory itself happened to be called foo.txt, then\n\
- \032 the whole directory and all the files in it will be backed up,\n\
- \032 regardless of their names.\n\
+ \032 you set backup = Name *.txt and then delete a whole directory named foo\n\
+ \032 containing some text files, these files will not be backed up because\n\
+ \032 Unison will just check that foo does not match *.txt. Similarly, if the\n\
+ \032 directory itself happened to be called foo.txt, then the whole\n\
+ \032 directory and all the files in it will be backed up, regardless of\n\
+ \032 their names.\n\
\n\
\032 Backup files can be stored either centrally or locally. This behavior\n\
\032 is controlled by the preference backuplocation, whose value must be\n\
\032 either central or local. (The default is central.)\n\
\n\
- \032 When backups are stored locally, they are kept in the same directory\n\
- \032 as the original.\n\
+ \032 When backups are stored locally, they are kept in the same directory as\n\
+ \032 the original.\n\
\n\
\032 When backups are stored centrally, the directory used to hold them is\n\
\032 controlled by the preference backupdir and the environment variable\n\
@@ -2090,10 +2072,10 @@
\032 By default, backup files are named .bak.VERSION.FILENAME, where\n\
\032 FILENAME is the original filename and VERSION is the backup number (1\n\
\032 for the most recent, 2 for the next most recent, etc.). This can be\n\
- \032 changed by setting the preferences backupprefix and/or backupsuffix.\n\
- \032 If desired, backupprefix may include a directory prefix; this can be\n\
- \032 used with backuplocation = local to put all backup files for each\n\
- \032 directory into a single subdirectory. For example, setting\n\
+ \032 changed by setting the preferences backupprefix and/or backupsuffix. If\n\
+ \032 desired, backupprefix may include a directory prefix; this can be used\n\
+ \032 with backuplocation = local to put all backup files for each directory\n\
+ \032 into a single subdirectory. For example, setting\n\
\032 backuplocation = local\n\
\032 backupprefix = .unison/$VERSION.\n\
\032 backupsuffix =\n\
@@ -2112,26 +2094,26 @@
\032 Unison can invoke external programs to merge conflicting versions of a\n\
\032 file. The preference merge controls this process.\n\
\n\
- \032 The merge preference may be given once or several times in a\n\
- \032 preference file (it can also be given on the command line, of course,\n\
- \032 but this tends to be awkward because of the spaces and special\n\
- \032 characters involved). Each instance of the preference looks like this:\n\
+ \032 The merge preference may be given once or several times in a preference\n\
+ \032 file (it can also be given on the command line, of course, but this\n\
+ \032 tends to be awkward because of the spaces and special characters\n\
+ \032 involved). Each instance of the preference looks like this:\n\
\032 merge = <PATHSPEC> -> <MERGECMD>\n\
\n\
\032 The <PATHSPEC> here has exactly the same format as for the ignore\n\
\032 preference (see the section \"Path specification\" ). For example, using\n\
- \032 \"Name *.txt\" as the <PATHSPEC> tells Unison that this command should\n\
- \032 be used whenever a file with extension .txt needs to be merged.\n\
+ \032 \"Name *.txt\" as the <PATHSPEC> tells Unison that this command should be\n\
+ \032 used whenever a file with extension .txt needs to be merged.\n\
\n\
- \032 Many external merging programs require as inputs not just the two\n\
- \032 files that need to be merged, but also a file containing the last\n\
+ \032 Many external merging programs require as inputs not just the two files\n\
+ \032 that need to be merged, but also a file containing the last\n\
\032 synchronized version. You can ask Unison to keep a copy of the last\n\
- \032 synchronized version for some files using the backupcurrent\n\
- \032 preference. This preference is used in exactly the same way as backup\n\
- \032 and its meaning is similar, except that it causes backups to be kept\n\
- \032 of the current contents of each file after it has been synchronized by\n\
- \032 Unison, rather than the previous contents that Unison overwrote. These\n\
- \032 backups are kept on both replicas in the same place as ordinary backup\n\
+ \032 synchronized version for some files using the backupcurrent preference.\n\
+ \032 This preference is used in exactly the same way as backup and its\n\
+ \032 meaning is similar, except that it causes backups to be kept of the\n\
+ \032 current contents of each file after it has been synchronized by Unison,\n\
+ \032 rather than the previous contents that Unison overwrote. These backups\n\
+ \032 are kept on both replicas in the same place as ordinary backup\n\
\032 files--i.e. according to the backuplocation and backupdir preferences.\n\
\032 They are named like the original files if backupslocation is set to\n\
\032 'central' and otherwise, Unison uses the backupprefix and backupsuffix\n\
@@ -2140,80 +2122,79 @@
\032 The <MERGECMD> part of the preference specifies what external command\n\
\032 should be invoked to merge files at paths matching the <PATHSPEC>.\n\
\032 Within this string, several special substrings are recognized; these\n\
- \032 will be substituted with appropriate values before invoking a\n\
- \032 sub-shell to execute the command.\n\
- \032 * CURRENT1 is replaced by the name of (a temporary copy of) the\n\
- \032 local variant of the file.\n\
+ \032 will be substituted with appropriate values before invoking a sub-shell\n\
+ \032 to execute the command.\n\
+ \032 * CURRENT1 is replaced by the name of (a temporary copy of) the local\n\
+ \032 variant of the file.\n\
\032 * CURRENT2 is replaced by the name of a temporary file, into which\n\
\032 the contents of the remote variant of the file have been\n\
\032 transferred by Unison prior to performing the merge.\n\
\032 * CURRENTARCH is replaced by the name of the backed up copy of the\n\
- \032 original version of the file (i.e., the file saved by Unison if\n\
- \032 the current filename matches the path specifications for the\n\
- \032 backupcurrent preference, as explained above), if one exists. If\n\
- \032 no archive exists and CURRENTARCH appears in the merge command,\n\
- \032 then an error is signalled.\n\
- \032 * CURRENTARCHOPT is replaced by the name of the backed up copy of\n\
- \032 the original version of the file (i.e., its state at the end of\n\
- \032 the last successful run of Unison), if one exists, or the empty\n\
- \032 string if no archive exists.\n\
- \032 * NEW is replaced by the name of a temporary file that Unison\n\
- \032 expects to be written by the merge program when it finishes,\n\
- \032 giving the desired new contents of the file.\n\
+ \032 original version of the file (i.e., the file saved by Unison if the\n\
+ \032 current filename matches the path specifications for the\n\
+ \032 backupcurrent preference, as explained above), if one exists. If no\n\
+ \032 archive exists and CURRENTARCH appears in the merge command, then\n\
+ \032 an error is signalled.\n\
+ \032 * CURRENTARCHOPT is replaced by the name of the backed up copy of the\n\
+ \032 original version of the file (i.e., its state at the end of the\n\
+ \032 last successful run of Unison), if one exists, or the empty string\n\
+ \032 if no archive exists.\n\
+ \032 * NEW is replaced by the name of a temporary file that Unison expects\n\
+ \032 to be written by the merge program when it finishes, giving the\n\
+ \032 desired new contents of the file.\n\
\032 * PATH is replaced by the path (relative to the roots of the\n\
\032 replicas) of the file being merged.\n\
\032 * NEW1 and NEW2 are replaced by the names of temporary files that\n\
\032 Unison expects to be written by the merge program when it is only\n\
\032 able to partially merge the originals; in this case, NEW1 will be\n\
\032 written back to the local replica and NEW2 to the remote replica;\n\
- \032 NEWARCH, if present, will be used as the \"last common state\" of\n\
- \032 the replicas. (These three options are provided for later\n\
- \032 compatibility with the Harmony data synchronizer.)\n\
+ \032 NEWARCH, if present, will be used as the \"last common state\" of the\n\
+ \032 replicas. (These three options are provided for later compatibility\n\
+ \032 with the Harmony data synchronizer.)\n\
\n\
\032 To accommodate the wide variety of programs that users might want to\n\
- \032 use for merging, Unison checks for several possible situations when\n\
- \032 the merge program exits:\n\
+ \032 use for merging, Unison checks for several possible situations when the\n\
+ \032 merge program exits:\n\
\032 * If the merge program exits with a non-zero status, then merge is\n\
\032 considered to have failed and the replicas are not changed.\n\
\032 * If the file NEW has been created, it is written back to both\n\
\032 replicas (and stored in the backup directory). Similarly, if just\n\
\032 the file NEW1 has been created, it is written back to both\n\
\032 replicas.\n\
- \032 * If neither NEW nor NEW1 have been created, then Unison examines\n\
- \032 the temporary files CURRENT1 and CURRENT2 that were given as\n\
- \032 inputs to the merge program. If either has been changed (or both\n\
- \032 have been changed in identical ways), then its new contents are\n\
- \032 written back to both replicas. If either CURRENT1 or CURRENT2 has\n\
- \032 been deleted, then the contents of the other are written back to\n\
- \032 both replicas.\n\
+ \032 * If neither NEW nor NEW1 have been created, then Unison examines the\n\
+ \032 temporary files CURRENT1 and CURRENT2 that were given as inputs to\n\
+ \032 the merge program. If either has been changed (or both have been\n\
+ \032 changed in identical ways), then its new contents are written back\n\
+ \032 to both replicas. If either CURRENT1 or CURRENT2 has been deleted,\n\
+ \032 then the contents of the other are written back to both replicas.\n\
\032 * If the files NEW1, NEW2, and NEWARCH have all been created, they\n\
\032 are written back to the local replica, remote replica, and backup\n\
- \032 directory, respectively. If the files NEW1, NEW2 have been\n\
- \032 created, but NEWARCH has not, then these files are written back to\n\
- \032 the local replica and remote replica, respectively. Also, if NEW1\n\
- \032 and NEW2 have identical contents, then the same contents are\n\
- \032 stored as a backup (if the backupcurrent preference is set for\n\
- \032 this path) to reflect the fact that the path is currently in sync.\n\
+ \032 directory, respectively. If the files NEW1, NEW2 have been created,\n\
+ \032 but NEWARCH has not, then these files are written back to the local\n\
+ \032 replica and remote replica, respectively. Also, if NEW1 and NEW2\n\
+ \032 have identical contents, then the same contents are stored as a\n\
+ \032 backup (if the backupcurrent preference is set for this path) to\n\
+ \032 reflect the fact that the path is currently in sync.\n\
\032 * If NEW1 and NEW2 (resp. CURRENT1 and CURRENT2) are created (resp.\n\
\032 overwritten) with different contents but the merge command did not\n\
- \032 fail (i.e., it exited with status code 0), then we copy NEW1\n\
- \032 (resp. CURRENT1) to the other replica and to the archive.\n\
+ \032 fail (i.e., it exited with status code 0), then we copy NEW1 (resp.\n\
+ \032 CURRENT1) to the other replica and to the archive.\n\
\032 This behavior is a design choice made to handle the case where a\n\
\032 merge command only synchronizes some specific contents between two\n\
- \032 files, skipping some irrelevant information (order between\n\
- \032 entries, for instance). We assume that, if the merge command exits\n\
- \032 normally, then the two resulting files are \"as good as equal.\"\n\
- \032 (The reason we copy one on top of the other is to avoid Unison\n\
- \032 detecting that the files are unequal the next time it is run and\n\
- \032 trying again to merge them when, in fact, the merge program has\n\
- \032 already made them as similar as it is able to.)\n\
+ \032 files, skipping some irrelevant information (order between entries,\n\
+ \032 for instance). We assume that, if the merge command exits normally,\n\
+ \032 then the two resulting files are \"as good as equal.\" (The reason we\n\
+ \032 copy one on top of the other is to avoid Unison detecting that the\n\
+ \032 files are unequal the next time it is run and trying again to merge\n\
+ \032 them when, in fact, the merge program has already made them as\n\
+ \032 similar as it is able to.)\n\
\n\
\032 If the confirmmerge preference is set and Unison is not run in batch\n\
\032 mode, then Unison will always ask for confirmation before actually\n\
\032 committing the results of the merge to the replicas.\n\
\n\
- \032 A large number of external merging programs are available. For\n\
- \032 example, on Unix systems setting the merge preference to\n\
+ \032 A large number of external merging programs are available. For example,\n\
+ \032 on Unix systems setting the merge preference to\n\
\032 merge = Name *.txt -> diff3 -m CURRENT1 CURRENTARCH CURRENT2\n\
\032 > NEW || echo \"differences detected\"\n\
\n\
@@ -2233,31 +2214,30 @@
\n\
\032 Users running Mac OS X (you may need the Developer Tools installed to\n\
\032 get the opendiff utility) may prefer\n\
- \032 merge = Name *.txt -> opendiff CURRENT1 CURRENT2 -ancestor CURRENTARCH -mer\n\
- ge NEW\n\
+ \032 merge = Name *.txt -> opendiff CURRENT1 CURRENT2 -ancestor CURRENTARCH -merg\n\
+ e NEW\n\
\n\
- \032 Here is a slightly more involved hack. The opendiff program can\n\
- \032 operate either with or without an archive file. A merge command of\n\
- \032 this form\n\
+ \032 Here is a slightly more involved hack. The opendiff program can operate\n\
+ \032 either with or without an archive file. A merge command of this form\n\
\032 merge = Name *.txt ->\n\
\032 if [ CURRENTARCHOPTx = x ];\n\
\032 then opendiff CURRENT1 CURRENT2 -merge NEW;\n\
- \032 else opendiff CURRENT1 CURRENT2 -ancestor CURRENTARCHOPT -merge N\n\
- EW;\n\
+ \032 else opendiff CURRENT1 CURRENT2 -ancestor CURRENTARCHOPT -merge NE\n\
+ W;\n\
\032 fi\n\
\n\
\032 (still all on one line in the preference file!) will test whether an\n\
- \032 archive file exists and use the appropriate variant of the arguments\n\
- \032 to opendiff.\n\
+ \032 archive file exists and use the appropriate variant of the arguments to\n\
+ \032 opendiff.\n\
\n\
- \032 Ordinarily, external merge programs are only invoked when Unison is\n\
- \032 not running in batch mode. To specify an external merge program that\n\
- \032 should be used no matter the setting of the batch flag, use the\n\
- \032 mergebatch preference instead of merge.\n\
+ \032 Ordinarily, external merge programs are only invoked when Unison is not\n\
+ \032 running in batch mode. To specify an external merge program that should\n\
+ \032 be used no matter the setting of the batch flag, use the mergebatch\n\
+ \032 preference instead of merge.\n\
\n\
\032 Please post suggestions for other useful values of the merge\n\
\032 preference to the unison-users mailing list--we'd like to give\n\
- \032 several examples here. \n\
+ \032 several examples here.\n\
\n\
The User Interface\n\
\n\
@@ -2277,12 +2257,11 @@
\n\
\032 When running in the textual mode, Unison returns an exit status, which\n\
\032 describes whether, and at which level, the synchronization was\n\
- \032 successful. The exit status could be useful when Unison is invoked\n\
- \032 from a script. Currently, there are four possible values for the exit\n\
+ \032 successful. The exit status could be useful when Unison is invoked from\n\
+ \032 a script. Currently, there are four possible values for the exit\n\
\032 status:\n\
\032 * 0: successful synchronization; everything is up-to-date now.\n\
- \032 * 1: some files were skipped, but all file transfers were\n\
- \032 successful.\n\
+ \032 * 1: some files were skipped, but all file transfers were successful.\n\
\032 * 2: non-fatal failures occurred during file transfer.\n\
\032 * 3: a fatal error occurred, or the execution was interrupted.\n\
\n\
@@ -2301,19 +2280,23 @@
\032 often, stored in profiles, using the same syntax as other\n\
\032 preferences. For example, a profile line of the form\n\
\032 ignore = pattern\n\
+ \n\
\032 adds pattern to the list of patterns to be ignored.\n\
\032 * Each pattern can have one of three forms. The most general form is\n\
\032 a Posix extended regular expression introduced by the keyword\n\
- \032 Regex. (The collating sequences and character classes of full\n\
- \032 Posix regexps are not currently supported).\n\
+ \032 Regex. (The collating sequences and character classes of full Posix\n\
+ \032 regexps are not currently supported).\n\
\032 Regex regexp\n\
- \032 For convenience, three other styles of pattern are also\n\
- \032 recognized:\n\
+ \n\
+ \032 For convenience, three other styles of pattern are also recognized:\n\
\032 Name name\n\
+ \n\
\032 matches any path in which the last component matches name,\n\
\032 Path path\n\
+ \n\
\032 matches exactly the path path, and\n\
\032 BelowPath path\n\
+ \n\
\032 matches the path path and any path below. The name and path\n\
\032 arguments of the latter forms of patterns are not regular\n\
\032 expressions. Instead, standard \"globbing\" conventions can be used\n\
@@ -2329,16 +2312,15 @@
\032 makes it possible to use the same set of path patterns for both\n\
\032 Unix and Windows file systems.\n\
\n\
- \032 Some examples of path patterns appear in the section \"Ignoring Paths\"\n\
- \032 .\n\
+ \032 Some examples of path patterns appear in the section \"Ignoring Paths\" .\n\
\n\
Ignoring Paths\n\
\n\
\032 Most users of Unison will find that their replicas contain lots of\n\
- \032 files that they don't ever want to synchronize -- temporary files,\n\
- \032 very large files, old stuff, architecture-specific binaries, etc. They\n\
- \032 can instruct Unison to ignore these paths using patterns introduced in\n\
- \032 the section \"Path Patterns\" .\n\
+ \032 files that they don't ever want to synchronize -- temporary files, very\n\
+ \032 large files, old stuff, architecture-specific binaries, etc. They can\n\
+ \032 instruct Unison to ignore these paths using patterns introduced in the\n\
+ \032 section \"Path Patterns\" .\n\
\n\
\032 For example, the following pattern will make Unison ignore any path\n\
\032 containing the name CVS or a name ending in .cmo:\n\
@@ -2347,8 +2329,8 @@
\032 The next pattern makes Unison ignore the path a/b:\n\
\032 ignore = Path a/b\n\
\n\
- \032 Path patterns do not skip filesnames beginning with . (as Name\n\
- \032 patterns do). For example,\n\
+ \032 Path patterns do not skip filesnames beginning with . (as Name patterns\n\
+ \032 do). For example,\n\
\032 ignore = Path */tmp\n\
\n\
\032 will include .foo/tmp in the set of ignore directories, as it is a\n\
@@ -2363,12 +2345,12 @@
\n\
\032 Here are a few extra points regarding the ignore preference.\n\
\032 * If a directory is ignored, all its descendents will be too.\n\
- \032 * The user interface provides some convenient commands for adding\n\
- \032 new patterns to be ignored. To ignore a particular file, select it\n\
- \032 and press \"i\". To ignore all files with the same extension, select\n\
- \032 it and press \"E\" (with the shift key). To ignore all files with\n\
- \032 the same name, no matter what directory they appear in, select it\n\
- \032 and press \"N\". These new patterns become permanent: they are\n\
+ \032 * The user interface provides some convenient commands for adding new\n\
+ \032 patterns to be ignored. To ignore a particular file, select it and\n\
+ \032 press \"i\". To ignore all files with the same extension, select it\n\
+ \032 and press \"E\" (with the shift key). To ignore all files with the\n\
+ \032 same name, no matter what directory they appear in, select it and\n\
+ \032 press \"N\". These new patterns become permanent: they are\n\
\032 immediately added to the current profile on disk.\n\
\032 * If you use the include directive to include a common collection of\n\
\032 preferences in several top-level preference files, you will\n\
@@ -2389,12 +2371,12 @@
\032 an ignore pattern. However, the interaction of these two sets of\n\
\032 patterns can be a little tricky. Here is exactly how it works:\n\
\032 + Unison starts detecting updates from the root of the\n\
- \032 replicas--i.e., from the empty path. If the empty path\n\
- \032 matches an ignore pattern and does not match an ignorenot\n\
- \032 pattern, then the whole replica will be ignored. (For this\n\
- \032 reason, it is not a good idea to include Name * as an ignore\n\
- \032 pattern. If you want to ignore everything except a certain\n\
- \032 set of files, use Name ?*.)\n\
+ \032 replicas--i.e., from the empty path. If the empty path matches\n\
+ \032 an ignore pattern and does not match an ignorenot pattern,\n\
+ \032 then the whole replica will be ignored. (For this reason, it\n\
+ \032 is not a good idea to include Name * as an ignore pattern. If\n\
+ \032 you want to ignore everything except a certain set of files,\n\
+ \032 use Name ?*.)\n\
\032 + If the root is a directory, Unison continues looking for\n\
\032 updates in all the immediate children of the root. Again, if\n\
\032 the name of some child matches an ignore pattern and does not\n\
@@ -2410,10 +2392,10 @@
\032 where the link points, and it will propagate changes in this string to\n\
\032 the other replica.\n\
\n\
- \032 It is sometimes useful to treat a symbolic link \"transparently,\"\n\
- \032 acting as though whatever it points to were physically in the replica\n\
- \032 at the point where the symbolic link appears. To tell Unison to treat\n\
- \032 a link in this manner, add a line of the form\n\
+ \032 It is sometimes useful to treat a symbolic link \"transparently,\" acting\n\
+ \032 as though whatever it points to were physically in the replica at the\n\
+ \032 point where the symbolic link appears. To tell Unison to treat a link\n\
+ \032 in this manner, add a line of the form\n\
\032 follow = pathspec\n\
\n\
\032 to the profile, where pathspec is a path pattern as described in the\n\
@@ -2431,9 +2413,9 @@
\032 different filesytems are involved (e.g., when synchronizing a Windows\n\
\032 client and a Unix server). In detail, here's how it works:\n\
\032 * When the permission bits of an existing file or directory are\n\
- \032 changed, the values of those bits that make sense on both\n\
- \032 operating systems will be propagated to the other replica. The\n\
- \032 other bits will not be changed.\n\
+ \032 changed, the values of those bits that make sense on both operating\n\
+ \032 systems will be propagated to the other replica. The other bits\n\
+ \032 will not be changed.\n\
\032 * When a newly created file is propagated to a remote replica, the\n\
\032 permission bits that make sense in both operating systems are also\n\
\032 propagated. The values of the other bits are set to default values\n\
@@ -2455,8 +2437,8 @@
\032 not case sensitive: foo and FOO can only refer to the same file. This\n\
\032 means that a Unix foo and FOO cannot be synchronized onto a Windows\n\
\032 system -- Windows won't allow two different files to have the \"same\"\n\
- \032 name. Unison detects this situation for you, and reports that it\n\
- \032 cannot synchronize the files.\n\
+ \032 name. Unison detects this situation for you, and reports that it cannot\n\
+ \032 synchronize the files.\n\
\n\
\032 You can deal with a case conflict in a couple of ways. If you need to\n\
\032 have both files on the Windows system, your only choice is to rename\n\
@@ -2469,11 +2451,11 @@
\n\
\032 Illegal filenames. Unix allows some filenames that are illegal in\n\
\032 Windows. For example, colons (`:') are not allowed in Windows\n\
- \032 filenames, but they are legal in Unix filenames. This means that a\n\
- \032 Unix file foo:bar can't be synchronized to a Windows system. As with\n\
- \032 case conflicts, Unison detects this situation for you, and you have\n\
- \032 the same options: you can either rename the Unix file and\n\
- \032 re-synchronize, or you can ignore it.\n\
+ \032 filenames, but they are legal in Unix filenames. This means that a Unix\n\
+ \032 file foo:bar can't be synchronized to a Windows system. As with case\n\
+ \032 conflicts, Unison detects this situation for you, and you have the same\n\
+ \032 options: you can either rename the Unix file and re-synchronize, or you\n\
+ \032 can ignore it.\n\
\n\
Slow Links\n\
\n\
@@ -2482,12 +2464,11 @@
\n\
\032 Unison uses the \"rsync protocol\" designed by Andrew Tridgell and Paul\n\
\032 Mackerras to greatly speed up transfers of large files in which only\n\
- \032 small changes have been made. More information about the rsync\n\
- \032 protocol can be found at the rsync web site\n\
- \032 (http://samba.anu.edu.au/rsync/).\n\
+ \032 small changes have been made. More information about the rsync protocol\n\
+ \032 can be found at the rsync web site (http://samba.anu.edu.au/rsync/).\n\
\n\
- \032 If you are using Unison with ssh, you may get some speed improvement\n\
- \032 by enabling ssh's compression feature. Do this by adding the option\n\
+ \032 If you are using Unison with ssh, you may get some speed improvement by\n\
+ \032 enabling ssh's compression feature. Do this by adding the option\n\
\032 \"-sshargs -C\" to the command line or \"sshargs = -C\" to your profile.\n\
\n\
Making Unison Faster on Large Files\n\
@@ -2499,8 +2480,8 @@
\032 of transferring a large file, it will attempt to retransfer the whole\n\
\032 thing on the next run.\n\
\n\
- \032 These shortcomings can be addressed with a little extra work by\n\
- \032 telling Unison to use an external file copying utility for whole-file\n\
+ \032 These shortcomings can be addressed with a little extra work by telling\n\
+ \032 Unison to use an external file copying utility for whole-file\n\
\032 transfers. The recommended one is the standalone rsync tool, which is\n\
\032 available by default on most Unix systems and can easily be installed\n\
\032 on Windows systems using Cygwin.\n\
@@ -2508,30 +2489,30 @@
\032 If you have rsync installed on both hosts, you can make Unison use it\n\
\032 simply by setting the copythreshold flag to something non-negative. If\n\
\032 you set it to 0, Unison will use the external copy utility for all\n\
- \032 whole-file transfers. (This is probably slower than letting Unison\n\
- \032 copy small files by itself, but can be useful for testing.) If you set\n\
- \032 it to a larger value, Unison will use the external utility for all\n\
- \032 files larger than this size (which is given in kilobytes, so setting\n\
- \032 it to 1000 will cause the external tool to be used for all transfers\n\
- \032 larger than a megabyte).\n\
+ \032 whole-file transfers. (This is probably slower than letting Unison copy\n\
+ \032 small files by itself, but can be useful for testing.) If you set it to\n\
+ \032 a larger value, Unison will use the external utility for all files\n\
+ \032 larger than this size (which is given in kilobytes, so setting it to\n\
+ \032 1000 will cause the external tool to be used for all transfers larger\n\
+ \032 than a megabyte).\n\
\n\
\032 If you want to use a different external copy utility, set both the\n\
\032 copyprog and copyprogpartial preferences--the former is used for the\n\
\032 first transfer of a file, while the latter is used when Unison sees a\n\
- \032 partially transferred temp file on the receiving host. Be careful\n\
- \032 here: Your external tool needs to be instructed to copy files in place\n\
+ \032 partially transferred temp file on the receiving host. Be careful here:\n\
+ \032 Your external tool needs to be instructed to copy files in place\n\
\032 (otherwise if the transfer is interrupted Unison will not notice that\n\
- \032 some of the data has already been transferred, the next time it\n\
- \032 tries). The default values are:\n\
+ \032 some of the data has already been transferred, the next time it tries).\n\
+ \032 The default values are:\n\
\032 copyprog = rsync --inplace --compress\n\
\032 copyprogrest = rsync --partial --inplace --compress\n\
\n\
- \032 You may also need to set the copyquoterem preference. When it is set\n\
- \032 to true, this causes Unison to add an extra layer of quotes to the\n\
- \032 remote path passed to the external copy program. This is is needed by\n\
- \032 rsync, for example, which internally uses an ssh connection, requiring\n\
- \032 an extra level of quoting for paths containing spaces. When this flag\n\
- \032 is set to default, extra quotes are added if the value of copyprog\n\
+ \032 You may also need to set the copyquoterem preference. When it is set to\n\
+ \032 true, this causes Unison to add an extra layer of quotes to the remote\n\
+ \032 path passed to the external copy program. This is is needed by rsync,\n\
+ \032 for example, which internally uses an ssh connection, requiring an\n\
+ \032 extra level of quoting for paths containing spaces. When this flag is\n\
+ \032 set to default, extra quotes are added if the value of copyprog\n\
\032 contains the string rsync. The default value is default, naturally.\n\
\n\
\032 If a directory transfer is interrupted, the next run of Unison will\n\
@@ -2546,28 +2527,28 @@
Fast Update Detection\n\
\n\
\032 If your replicas are large and at least one of them is on a Windows\n\
- \032 system, you may find that Unison's default method for detecting\n\
- \032 changes (which involves scanning the full contents of every file on\n\
- \032 every sync--the only completely safe way to do it under Windows) is\n\
- \032 too slow. Unison provides a preference fastcheck that, when set to\n\
- \032 true, causes it to use file creation times as 'pseudo inode numbers'\n\
- \032 when scanning replicas for updates, instead of reading the full\n\
- \032 contents of every file.\n\
+ \032 system, you may find that Unison's default method for detecting changes\n\
+ \032 (which involves scanning the full contents of every file on every\n\
+ \032 sync--the only completely safe way to do it under Windows) is too slow.\n\
+ \032 Unison provides a preference fastcheck that, when set to true, causes\n\
+ \032 it to use file creation times as 'pseudo inode numbers' when scanning\n\
+ \032 replicas for updates, instead of reading the full contents of every\n\
+ \032 file.\n\
\n\
\032 When fastcheck is set to no, Unison will perform slow\n\
\032 checking--re-scanning the contents of each file on each\n\
\032 synchronization--on all replicas. When fastcheck is set to default\n\
- \032 (which, naturally, is the default), Unison will use fast checks on\n\
- \032 Unix replicas and slow checks on Windows replicas.\n\
+ \032 (which, naturally, is the default), Unison will use fast checks on Unix\n\
+ \032 replicas and slow checks on Windows replicas.\n\
\n\
\032 This strategy may cause Unison to miss propagating an update if the\n\
\032 modification time and length of the file are both unchanged by the\n\
\032 update. However, Unison will never overwrite such an update with a\n\
\032 change from the other replica, since it always does a safe check for\n\
- \032 updates just before propagating a change. Thus, it is reasonable to\n\
- \032 use this switch most of the time and occasionally run Unison once with\n\
- \032 fastcheck set to no, if you are worried that Unison may have\n\
- \032 overlooked an update.\n\
+ \032 updates just before propagating a change. Thus, it is reasonable to use\n\
+ \032 this switch most of the time and occasionally run Unison once with\n\
+ \032 fastcheck set to no, if you are worried that Unison may have overlooked\n\
+ \032 an update.\n\
\n\
\032 Fastcheck is (always) automatically disabled for files with extension\n\
\032 .xls or .mpp, to prevent Unison from being confused by the habits of\n\
@@ -2576,12 +2557,12 @@
\n\
Mount Points and Removable Media\n\
\n\
- \032 Using Unison removable media such as USB drives can be dangerous\n\
- \032 unless you are careful. If you synchronize a directory that is stored\n\
- \032 on removable media when the media is not present, it will look to\n\
- \032 Unison as though the whole directory has been deleted, and it will\n\
- \032 proceed to delete the directory from the other replica--probably not\n\
- \032 what you want!\n\
+ \032 Using Unison removable media such as USB drives can be dangerous unless\n\
+ \032 you are careful. If you synchronize a directory that is stored on\n\
+ \032 removable media when the media is not present, it will look to Unison\n\
+ \032 as though the whole directory has been deleted, and it will proceed to\n\
+ \032 delete the directory from the other replica--probably not what you\n\
+ \032 want!\n\
\n\
\032 To prevent accidents, Unison provides a preference called mountpoint.\n\
\032 Including a line like\n\
@@ -2604,10 +2585,9 @@
\032 Unison's regular window, plus a console window, which is used only for\n\
\032 giving your password to ssh (if you do not use ssh to connect, you can\n\
\032 ignore this window). When your password is requested, you'll need to\n\
- \032 activate the console window (e.g., by clicking in it) before typing.\n\
- \032 If you start Unison from a DOS window, Unison's regular window will\n\
- \032 appear and you will type your password in the DOS window you were\n\
- \032 using.\n\
+ \032 activate the console window (e.g., by clicking in it) before typing. If\n\
+ \032 you start Unison from a DOS window, Unison's regular window will appear\n\
+ \032 and you will type your password in the DOS window you were using.\n\
\n\
\032 To use Unison in this mode, you must first create a profile (see the\n\
\032 section \"Profile\" ). Use your favorite editor for this.\n\
@@ -2619,8 +2599,8 @@
\n\
\032 Warning: These instructions may be out of date. More current\n\
\032 information can be found the Unison Wiki\n\
- \032 (http://alliance.seas.upenn.edu/ bcpierce/wiki/index.php?n=Main.Unison\n\
- \032 FAQOSSpecific).\n\
+ \032 (http://alliance.seas.upenn.edu/ bcpierce/wiki/index.php?n=Main.UnisonF\n\
+ \032 AQOSSpecific).\n\
\n\
\032 Your local host will need just an ssh client; the remote host needs an\n\
\032 ssh server (or daemon), which is available on Unix systems. Unison is\n\
@@ -2654,25 +2634,25 @@
\032 of dialogs that you will have to go through. Select \"Install\n\
\032 from Internet.\" For \"Local Package Directory\" select the\n\
\032 directory Foo. For \"Select install root directory\" we\n\
- \032 recommend that you use the default, C:\\cygwin. The next\n\
- \032 dialog asks you to select the way that you want to connect to\n\
- \032 the network to download the installation files; we have used\n\
- \032 \"Use IE5 Settings\" successfully, but you may need to make a\n\
+ \032 recommend that you use the default, C:\\cygwin. The next dialog\n\
+ \032 asks you to select the way that you want to connect to the\n\
+ \032 network to download the installation files; we have used \"Use\n\
+ \032 IE5 Settings\" successfully, but you may need to make a\n\
\032 different selection depending on your networking setup. The\n\
\032 next dialog gives a list of mirrors; select one close to you.\n\
\032 Next you are asked to select which packages to install. The\n\
\032 default settings in this dialog download a lot of packages\n\
- \032 that are not strictly necessary to run Unison with ssh. If\n\
- \032 you don't want to install a package, click on it until \"skip\"\n\
- \032 is shown. For a minimum installation, select only the\n\
- \032 packages \"cygwin\" and \"openssh,\" which come to about 1900KB;\n\
- \032 the full installation is much larger.\n\
+ \032 that are not strictly necessary to run Unison with ssh. If you\n\
+ \032 don't want to install a package, click on it until \"skip\" is\n\
+ \032 shown. For a minimum installation, select only the packages\n\
+ \032 \"cygwin\" and \"openssh,\" which come to about 1900KB; the full\n\
+ \032 installation is much larger.\n\
\n\
\032 Note that you are plan to build unison using the free CygWin GNU C\n\
- \032 compiler, you need to install essential development packages such\n\
- \032 as \"gcc\", \"make\", \"fileutil\", etc; we refer to the file\n\
+ \032 compiler, you need to install essential development packages such as\n\
+ \032 \"gcc\", \"make\", \"fileutil\", etc; we refer to the file\n\
\032 \"INSTALL.win32-cygwin-gnuc\" in the source distribution for further\n\
- \032 details. \n\
+ \032 details.\n\
\032 After the packages are downloaded and installed, the next\n\
\032 dialog allows you to choose whether to \"Create Desktop Icon\"\n\
\032 and \"Add to Start Menu.\" You make the call.\n\
@@ -2680,14 +2660,16 @@
\032 Some people have reported problems using Cygwin's ssh with Unison.\n\
\032 If you have trouble, you might try other ones instead:\n\
\032 http://linuxmafia.com/ssh/win32.html\n\
+ \n\
\032 2. You must set the environment variables HOME and PATH. Ssh will\n\
\032 create a directory .ssh in the directory given by HOME, so that it\n\
\032 has a place to keep data like your public and private keys. PATH\n\
- \032 must be set to include the Cygwin bin directory, so that Unison\n\
- \032 can find the ssh executable.\n\
+ \032 must be set to include the Cygwin bin directory, so that Unison can\n\
+ \032 find the ssh executable.\n\
\032 + On Windows 95/98, add the lines\n\
\032 set PATH=%PATH%;<SSHDIR>\n\
\032 set HOME=<HOMEDIR>\n\
+ \n\
\032 to the file C:\\AUTOEXEC.BAT, where <HOMEDIR> is the directory\n\
\032 where you want ssh to create its .ssh directory, and <SSHDIR>\n\
\032 is the directory where the executable ssh.exe is stored; if\n\
@@ -2701,24 +2683,25 @@
\032 variables\n\
\032 then select Path and edit its value by appending ;<SSHDIR> to\n\
\032 it, where <SSHDIR> is the full name of the directory that\n\
- \032 includes the ssh executable; if you've installed Cygwin in\n\
- \032 the default location, this is C:\\cygwin\\bin.\n\
+ \032 includes the ssh executable; if you've installed Cygwin in the\n\
+ \032 default location, this is C:\\cygwin\\bin.\n\
\032 3. Test ssh from a DOS shell by typing\n\
\032 ssh <remote host> -l <login name>\n\
+ \n\
\032 You should get a prompt for your password on <remote host>,\n\
\032 followed by a working connection.\n\
- \032 4. Note that ssh-keygen may not work (fails with \"gethostname: no\n\
- \032 such file or directory\") on some systems. This is OK: you can use\n\
- \032 ssh with your regular password for the remote system.\n\
- \032 5. You should now be able to use Unison with an ssh connection. If\n\
- \032 you are logged in with a different user name on the local and\n\
- \032 remote hosts, provide your remote user name when providing the\n\
- \032 remote root (i.e., //username at host/path...).\n\
+ \032 4. Note that ssh-keygen may not work (fails with \"gethostname: no such\n\
+ \032 file or directory\") on some systems. This is OK: you can use ssh\n\
+ \032 with your regular password for the remote system.\n\
+ \032 5. You should now be able to use Unison with an ssh connection. If you\n\
+ \032 are logged in with a different user name on the local and remote\n\
+ \032 hosts, provide your remote user name when providing the remote root\n\
+ \032 (i.e., //username at host/path...).\n\
\n\
"))
::
- ("news", ("Changes in Version 2.40.65",
- "Changes in Version 2.40.65\n\
+ ("news", ("Changes in Version 2.40.102",
+ "Changes in Version 2.40.102\n\
\n\
\032 Changes since 2.40.1:\n\
\032 * Added \"BelowPath\" patterns, that match a path as well as all paths\n\
@@ -2726,42 +2709,42 @@
\032 preferences)\n\
\032 * Added a \"fat\" preference that makes Unison use the right options\n\
\032 when one of the replica is on a FAT filesystem.\n\
- \032 * Allow \"prefer/force=newer\" even when not synchronizing\n\
- \032 modification times. (The reconciler will not be aware of the\n\
- \032 modification time of unchanged files, so the synchronization\n\
- \032 choices of Unison can be different from when \"times=true\", but the\n\
- \032 behavior remains sane: changed files with the most recent\n\
- \032 modification time will be propagated.)\n\
+ \032 * Allow \"prefer/force=newer\" even when not synchronizing modification\n\
+ \032 times. (The reconciler will not be aware of the modification time\n\
+ \032 of unchanged files, so the synchronization choices of Unison can be\n\
+ \032 different from when \"times=true\", but the behavior remains sane:\n\
+ \032 changed files with the most recent modification time will be\n\
+ \032 propagated.)\n\
\032 * Minor fixes and improvements:\n\
\032 + Compare filenames up to decomposition in case sensitive mode\n\
\032 when one host is running MacOSX and the unicode preference is\n\
\032 set to true.\n\
\032 + Rsync: somewhat faster compressor\n\
- \032 + Make Unicode the default on all architectures (it was only\n\
- \032 the default when a Mac OS X or Windows machine was involved).\n\
+ \032 + Make Unicode the default on all architectures (it was only the\n\
+ \032 default when a Mac OS X or Windows machine was involved).\n\
\n\
\032 Changes since 2.32:\n\
\032 * Major enhancement: Unicode support.\n\
\032 + Unison should now handle unicode filenames correctly on all\n\
\032 platforms.\n\
\032 + This functionality is controlled by a new preference unicode.\n\
- \032 + Unicode mode is now the default when one of the hosts is\n\
- \032 under Windows or MacOS. This may make upgrades a bit more\n\
- \032 painful (the archives cannot be reused), but this is a much\n\
- \032 saner default.\n\
+ \032 + Unicode mode is now the default when one of the hosts is under\n\
+ \032 Windows or MacOS. This may make upgrades a bit more painful\n\
+ \032 (the archives cannot be reused), but this is a much saner\n\
+ \032 default.\n\
\032 * Partial transfer of directories. If an error occurs while\n\
\032 transferring a directory, the part transferred so far is copied\n\
\032 into place (and the archives are updated accordingly). The\n\
- \032 \"maxerrors\" preference controls how many transfer error Unison\n\
- \032 will accept before stopping the transfer of a directory (by\n\
- \032 default, only one). This makes it possible to transfer most of a\n\
- \032 directory even if there are some errors. Currently, only the first\n\
- \032 error is reported by the GUIs.\n\
- \032 Also, allow partial transfer of a directory when there was an\n\
- \032 error deep inside this directory during update detection. At the\n\
- \032 moment, this is only activated with the text and GTK UIs, which\n\
- \032 have been modified so that they show that the transfer is going to\n\
- \032 be partial and so that they can display all errors.\n\
+ \032 \"maxerrors\" preference controls how many transfer error Unison will\n\
+ \032 accept before stopping the transfer of a directory (by default,\n\
+ \032 only one). This makes it possible to transfer most of a directory\n\
+ \032 even if there are some errors. Currently, only the first error is\n\
+ \032 reported by the GUIs.\n\
+ \032 Also, allow partial transfer of a directory when there was an error\n\
+ \032 deep inside this directory during update detection. At the moment,\n\
+ \032 this is only activated with the text and GTK UIs, which have been\n\
+ \032 modified so that they show that the transfer is going to be partial\n\
+ \032 and so that they can display all errors.\n\
\032 * Improvement to the code for resuming directory transfers:\n\
\032 + if a file was not correctly transferred (or the source has\n\
\032 been modified since, with unchanged size), Unison performs a\n\
@@ -2770,8 +2753,8 @@
\032 deleted on the source replica before resuming the transfer;\n\
\032 not deleting the file would result in it reappearing on the\n\
\032 target replica)\n\
- \032 * Experimental streaming protocol for transferring file contents\n\
- \032 (can be disabled by setting the directive \"stream\" to false): file\n\
+ \032 * Experimental streaming protocol for transferring file contents (can\n\
+ \032 be disabled by setting the directive \"stream\" to false): file\n\
\032 contents is transfered asynchronously (without waiting for a\n\
\032 response from the destination after each chunk sent) rather than\n\
\032 using the synchronous RPC mechanism. As a consequence:\n\
@@ -2781,9 +2764,9 @@
\032 + the transfer of large files uses the full available bandwidth\n\
\032 and is not slowed done due to the connection latency anymore\n\
\032 + we get performance improvement for small files as well by\n\
- \032 scheduling many files simultaneously (as scheduling a file\n\
- \032 for transfer consume little ressource: it does not mean\n\
- \032 allocating a large buffer anymore)\n\
+ \032 scheduling many files simultaneously (as scheduling a file for\n\
+ \032 transfer consume little ressource: it does not mean allocating\n\
+ \032 a large buffer anymore)\n\
\032 * Changes to the internal implementation of the rsync algorithm:\n\
\032 + use longer blocks for large files (the size of a block is the\n\
\032 square root of the size of the file for large files);\n\
@@ -2819,29 +2802,29 @@
\032 efficient alternative to \"maxthreads = 1\").\n\
\032 * Renamed preference \"pretendwin\" to \"ignoreinodenumbers\" (an alias\n\
\032 is kept for backwards compatibility).\n\
- \032 * Ignore one-second differences when synchronizing modification\n\
- \032 time. (Technically, this is an incompatible archive format change,\n\
- \032 but it is backward compatible. To trigger a problem, a user would\n\
- \032 have to synchronize modification times on a filesystem with a\n\
- \032 two-second granularity and then downgrade to a previous version of\n\
- \032 Unison, which does not work well in such a case. Thus, it does not\n\
- \032 seem worthwhile to increment the archive format number, which\n\
- \032 would impact all users.)\n\
- \032 * Do not keep many files simultaneously opened anymore when the\n\
- \032 rsync algorithm is in use.\n\
+ \032 * Ignore one-second differences when synchronizing modification time.\n\
+ \032 (Technically, this is an incompatible archive format change, but it\n\
+ \032 is backward compatible. To trigger a problem, a user would have to\n\
+ \032 synchronize modification times on a filesystem with a two-second\n\
+ \032 granularity and then downgrade to a previous version of Unison,\n\
+ \032 which does not work well in such a case. Thus, it does not seem\n\
+ \032 worthwhile to increment the archive format number, which would\n\
+ \032 impact all users.)\n\
+ \032 * Do not keep many files simultaneously opened anymore when the rsync\n\
+ \032 algorithm is in use.\n\
\032 * Add \"ignorearchives\" preference to ignore existing archives (to\n\
\032 avoid forcing users to delete them manually, in situations where\n\
\032 one archive has gotten deleted or corrupted).\n\
\032 * Mac OS\n\
- \032 + fixed rsync bug which could result in an \"index out of\n\
- \032 bounds\" error when transferring resource forks.\n\
+ \032 + fixed rsync bug which could result in an \"index out of bounds\"\n\
+ \032 error when transferring resource forks.\n\
\032 + Fixed bug which made Unison ignore finder information and\n\
\032 resource fork when compiled to 64bit on Mac OSX.\n\
\032 + should now be 64 bit clean (the Growl framework is not up to\n\
\032 date, though)\n\
- \032 + Made the bridge between Objective C and Ocaml code GC\n\
- \032 friendly (it was allocating ML values and putting them in an\n\
- \032 array which was not registered with the GC)\n\
+ \032 + Made the bridge between Objective C and Ocaml code GC friendly\n\
+ \032 (it was allocating ML values and putting them in an array\n\
+ \032 which was not registered with the GC)\n\
\032 + use darker grey arrows (patch contributed by Eric Y. Kow)\n\
\032 * GTK user interface\n\
\032 + assistant for creating profiles\n\
@@ -2864,8 +2847,8 @@
\032 + Do not display \"Looking for change\" messages during\n\
\032 propagation (when checking the targe is unchanged) but only\n\
\032 during update detection\n\
- \032 + Apply patch to fix some crashes in the OSX GUI, thanks to\n\
- \032 Onne Gorter.\n\
+ \032 + Apply patch to fix some crashes in the OSX GUI, thanks to Onne\n\
+ \032 Gorter.\n\
\032 * Text UI\n\
\032 + During update detection, display status by updating a single\n\
\032 line rather than generating a new line of output every so\n\
@@ -2879,23 +2862,23 @@
\032 + Windows text UI: now put the console into UTF-8 output mode.\n\
\032 This is the right thing to do when in Unicode mode, and is no\n\
\032 worse than what we had previously otherwise (the console use\n\
- \032 some esoteric encoding by default). This only works when\n\
- \032 using a Unicode font instead of the default raster font.\n\
+ \032 some esoteric encoding by default). This only works when using\n\
+ \032 a Unicode font instead of the default raster font.\n\
\032 + Don't get the home directory from environment variable HOME\n\
\032 under Windows (except for Cygwin binaries): we don't want the\n\
\032 behavior of Unison to depends on whether it is run from a\n\
\032 Cygwin shell (where HOME is set) or in any other way (where\n\
\032 HOME is usually not set).\n\
\032 * Miscellaneous fixes and improvements\n\
- \032 + Made a server waiting on a socket more resilient to\n\
- \032 unexpected lost connections from the client.\n\
+ \032 + Made a server waiting on a socket more resilient to unexpected\n\
+ \032 lost connections from the client.\n\
\032 + Small patch to property setting code suggested by Ulrich\n\
\032 Gernkow.\n\
\032 + Several fixes to the change transfer functions (both the\n\
\032 internal ones and external transfers using rsync). In\n\
- \032 particular, limit the number of simultaneous transfer using\n\
- \032 an rsync (as the rsync algorithm can use a large amount of\n\
- \032 memory when processing huge files)\n\
+ \032 particular, limit the number of simultaneous transfer using an\n\
+ \032 rsync (as the rsync algorithm can use a large amount of memory\n\
+ \032 when processing huge files)\n\
\032 + Keep track of which file contents are being transferred, and\n\
\032 delay the transfer of a file when another file with the same\n\
\032 contents is currently being transferred. This way, the second\n\
@@ -2906,12 +2889,12 @@
\032 on the next sync.\n\
\032 + Fixed bug with case insensitive mode on a case sensitive\n\
\032 filesystem:\n\
- \032 o if file \"a/a\" is created on one replica and directory\n\
- \032 \"A\" is created on the other, the file failed to be\n\
+ \032 o if file \"a/a\" is created on one replica and directory \"A\"\n\
+ \032 is created on the other, the file failed to be\n\
\032 synchronized the first time Unison is run afterwards, as\n\
- \032 Unison uses the wrong path \"a/a\" (if Unison is run\n\
- \032 again, the directories are in the archive, so the right\n\
- \032 path is used);\n\
+ \032 Unison uses the wrong path \"a/a\" (if Unison is run again,\n\
+ \032 the directories are in the archive, so the right path is\n\
+ \032 used);\n\
\032 o if file \"a\" appears on one replica and file \"A\" appears\n\
\032 on the other with different contents, Unison was unable\n\
\032 to synchronize them.\n\
@@ -2919,9 +2902,8 @@
\032 during synchronization: Unison now tells which file has been\n\
\032 updated, and how.\n\
\032 + Limit the length of temporary file names\n\
- \032 + Case sensitivity information put in the archive (in a\n\
- \032 backward compatible way) and checked when the archive is\n\
- \032 loaded\n\
+ \032 + Case sensitivity information put in the archive (in a backward\n\
+ \032 compatible way) and checked when the archive is loaded\n\
\032 + Got rid of the 16mb marshalling limit by marshalling to a\n\
\032 bigarray.\n\
\032 + Resume copy of partially transferred files.\n\
@@ -2929,8 +2911,8 @@
\032 Changes since 2.31:\n\
\032 * Small user interface changes\n\
\032 + Small change to text UI \"scanning...\" messages, to print just\n\
- \032 directories (hopefully making it clearer that individual\n\
- \032 files are not necessarily being fingerprinted).\n\
+ \032 directories (hopefully making it clearer that individual files\n\
+ \032 are not necessarily being fingerprinted).\n\
\032 * Minor fixes and improvements:\n\
\032 + Ignore one hour differences when deciding whether a file may\n\
\032 have been updated. This avoids slow update detection after\n\
@@ -2939,15 +2921,15 @@
\032 enough.\n\
\032 + Fix a small bug that was affecting mainly windows users. We\n\
\032 need to commit the archives at the end of the sync even if\n\
- \032 there are no updates to propagate because some files (in\n\
- \032 fact, if we've just switched to DST on windows, a LOT of\n\
- \032 files) might have new modtimes in the archive. (Changed the\n\
- \032 text UI only. It's less clear where to change the GUI.)\n\
+ \032 there are no updates to propagate because some files (in fact,\n\
+ \032 if we've just switched to DST on windows, a LOT of files)\n\
+ \032 might have new modtimes in the archive. (Changed the text UI\n\
+ \032 only. It's less clear where to change the GUI.)\n\
\032 + Don't delete the temp file when a transfer fails due to a\n\
- \032 fingerprint mismatch (so that we can have a look and see\n\
- \032 why!) We've also added more debugging code togive more\n\
- \032 informative error messages when we encounter the dreaded and\n\
- \032 longstanding \"assert failed during file transfer\" bug\n\
+ \032 fingerprint mismatch (so that we can have a look and see why!)\n\
+ \032 We've also added more debugging code togive more informative\n\
+ \032 error messages when we encounter the dreaded and longstanding\n\
+ \032 \"assert failed during file transfer\" bug\n\
\032 + Incorrect paths (\"path\" directive) now result in an error\n\
\032 update item rather than a fatal error.\n\
\032 + Create parent directories (with correct permissions) during\n\
@@ -2967,53 +2949,51 @@
\032 transfer protocol. Three new preferences have been added:\n\
\032 + copyprog is a string giving the name (and command-line\n\
\032 switches, if needed) of an external program that can be used\n\
- \032 to copy large files efficiently. By default, rsync is\n\
- \032 invoked, but other tools such as scp can be used instead by\n\
- \032 changing the value of this preference. (Although this is not\n\
- \032 its primary purpose, rsync is actually a pretty fast way of\n\
- \032 copying files that don't already exist on the receiving\n\
- \032 host.) For files that do already exist on (but that have been\n\
- \032 changed in one replica), Unison will always use its built-in\n\
+ \032 to copy large files efficiently. By default, rsync is invoked,\n\
+ \032 but other tools such as scp can be used instead by changing\n\
+ \032 the value of this preference. (Although this is not its\n\
+ \032 primary purpose, rsync is actually a pretty fast way of\n\
+ \032 copying files that don't already exist on the receiving host.)\n\
+ \032 For files that do already exist on (but that have been changed\n\
+ \032 in one replica), Unison will always use its built-in\n\
\032 implementation of the rsync algorithm.\n\
\032 + Added a \"copyprogrest\" preference, so that we can give\n\
- \032 different command lines for invoking the external copy\n\
- \032 utility depending on whether a partially transferred file\n\
- \032 already exists or not. (Rsync doesn't seem to care about\n\
- \032 this, but other utilities may.)\n\
+ \032 different command lines for invoking the external copy utility\n\
+ \032 depending on whether a partially transferred file already\n\
+ \032 exists or not. (Rsync doesn't seem to care about this, but\n\
+ \032 other utilities may.)\n\
\032 + copythreshold is an integer (-1 by default), indicating above\n\
\032 what filesize (in megabytes) Unison should use the external\n\
- \032 copying utility specified by copyprog. Specifying 0 will\n\
- \032 cause ALL copies to use the external program; a negative\n\
- \032 number will prevent any files from using it. (Default is -1.)\n\
+ \032 copying utility specified by copyprog. Specifying 0 will cause\n\
+ \032 ALL copies to use the external program; a negative number will\n\
+ \032 prevent any files from using it. (Default is -1.)\n\
\032 Thanks to Alan Schmitt for a huge amount of hacking and to an\n\
\032 anonymous sponsor for suggesting and underwriting this extension.\n\
\032 * Small improvements:\n\
- \032 + Added a new preference, dontchmod. By default, Unison uses\n\
- \032 the chmod system call to set the permission bits of files\n\
- \032 after it has copied them. But in some circumstances (and\n\
- \032 under some operating systems), the chmod call always fails.\n\
- \032 Setting this preference completely prevents Unison from ever\n\
- \032 calling chmod.\n\
+ \032 + Added a new preference, dontchmod. By default, Unison uses the\n\
+ \032 chmod system call to set the permission bits of files after it\n\
+ \032 has copied them. But in some circumstances (and under some\n\
+ \032 operating systems), the chmod call always fails. Setting this\n\
+ \032 preference completely prevents Unison from ever calling chmod.\n\
\032 + Don't ignore files that look like backup files if the\n\
\032 backuplocation preference is set to central\n\
\032 + Shortened the names of several preferences. The old names are\n\
- \032 also still supported, for backwards compatibility, but they\n\
- \032 do not appear in the documentation.\n\
+ \032 also still supported, for backwards compatibility, but they do\n\
+ \032 not appear in the documentation.\n\
\032 + Lots of little documentation tidying. (In particular,\n\
- \032 preferences are separated into Basic and Advanced! This\n\
- \032 should hopefully make Unison a little more approachable for\n\
- \032 new users.\n\
+ \032 preferences are separated into Basic and Advanced! This should\n\
+ \032 hopefully make Unison a little more approachable for new\n\
+ \032 users.\n\
\032 + Unison can sometimes fail to transfer a file, giving the\n\
- \032 unhelpful message \"Destination updated during\n\
- \032 synchronization\" even though the file has not been changed.\n\
- \032 This can be caused by programs that change either the file's\n\
- \032 contents or the file's extended attributes without changing\n\
- \032 its modification time. It's not clear what is the best fix\n\
- \032 for this - it is not Unison's fault, but it makes Unison's\n\
- \032 behavior puzzling - but at least Unison can be more helpful\n\
- \032 about suggesting a workaround (running once with fastcheck\n\
- \032 set to false). The failure message has been changed to give\n\
- \032 this advice.\n\
+ \032 unhelpful message \"Destination updated during synchronization\"\n\
+ \032 even though the file has not been changed. This can be caused\n\
+ \032 by programs that change either the file's contents or the\n\
+ \032 file's extended attributes without changing its modification\n\
+ \032 time. It's not clear what is the best fix for this - it is not\n\
+ \032 Unison's fault, but it makes Unison's behavior puzzling - but\n\
+ \032 at least Unison can be more helpful about suggesting a\n\
+ \032 workaround (running once with fastcheck set to false). The\n\
+ \032 failure message has been changed to give this advice.\n\
\032 + Further improvements to the OS X GUI (thanks to Alan Schmitt\n\
\032 and Craig Federighi).\n\
\032 * Very preliminary support for triggering Unison from an external\n\
@@ -3027,33 +3007,32 @@
\032 + start Unison with the command-line flag \"-repeat FOO\", where\n\
\032 FOO is name of a file where Unison should look for\n\
\032 notifications of changes\n\
- \032 + when it starts up, Unison will read the whole contents of\n\
- \032 this file (on both hosts), which should be a\n\
- \032 newline-separated list of paths (relative to the root of the\n\
- \032 synchronization) and synchronize just these paths, as if it\n\
- \032 had been started with the \"-path=xxx\" option for each one of\n\
- \032 them\n\
+ \032 + when it starts up, Unison will read the whole contents of this\n\
+ \032 file (on both hosts), which should be a newline-separated list\n\
+ \032 of paths (relative to the root of the synchronization) and\n\
+ \032 synchronize just these paths, as if it had been started with\n\
+ \032 the \"-path=xxx\" option for each one of them\n\
\032 + when it finishes, it will sleep for a few seconds and then\n\
\032 examine the watchfile again; if anything has been added, it\n\
\032 will read the new paths, synchronize them, and go back to\n\
\032 sleep\n\
\032 + that's it!\n\
\032 To use this to drive Unison \"incrementally,\" just start it in this\n\
- \032 mode and start up a tool (on each host) to watch for new changes\n\
- \032 to the filesystem and append the appropriate paths to the\n\
- \032 watchfile. Hopefully such tools should not be too hard to write.\n\
+ \032 mode and start up a tool (on each host) to watch for new changes to\n\
+ \032 the filesystem and append the appropriate paths to the watchfile.\n\
+ \032 Hopefully such tools should not be too hard to write.\n\
\032 * Bug fixes:\n\
\032 + Fixed a bug that was causing new files to be created with\n\
\032 permissions 0x600 instead of using a reasonable default (like\n\
- \032 0x644), if the 'perms' flag was set to 0. (Bug reported by\n\
- \032 Ben Crowell.)\n\
+ \032 0x644), if the 'perms' flag was set to 0. (Bug reported by Ben\n\
+ \032 Crowell.)\n\
\032 + Follow maxthreads preference when transferring directories.\n\
\n\
\032 Changes since 2.17:\n\
\032 * Major rewrite and cleanup of the whole Mac OS X graphical user\n\
\032 interface by Craig Federighi. Thanks, Craig!!!\n\
- \032 * Small fix to ctime (non-)handling in update detection under\n\
- \032 windows with fastcheck.\n\
+ \032 * Small fix to ctime (non-)handling in update detection under windows\n\
+ \032 with fastcheck.\n\
\032 * Several small fixes to the GTK2 UI to make it work better under\n\
\032 Windows [thanks to Karl M for these].\n\
\032 * The backup functionality has been completely rewritten. The\n\
@@ -3080,19 +3059,19 @@
\032 path as an error, rather than treating the symlink itself as\n\
\032 missing or deleted. This avoids a potentially dangerous\n\
\032 situation where a followed symlink points to an external\n\
- \032 filesystem that might be offline when Unison is run\n\
- \032 (whereupon Unison would cheerfully delete the corresponding\n\
- \032 files in the other replica!).\n\
+ \032 filesystem that might be offline when Unison is run (whereupon\n\
+ \032 Unison would cheerfully delete the corresponding files in the\n\
+ \032 other replica!).\n\
\032 * Smaller changes:\n\
- \032 + Added forcepartial and preferpartial preferences, which\n\
- \032 behave like force and prefer but can be specified on a\n\
- \032 per-path basis. [Thanks to Alan Schmitt for this.]\n\
+ \032 + Added forcepartial and preferpartial preferences, which behave\n\
+ \032 like force and prefer but can be specified on a per-path\n\
+ \032 basis. [Thanks to Alan Schmitt for this.]\n\
\032 + A bare-bones self test feature was added, which runs unison\n\
\032 through some of its paces and checks that the results are as\n\
- \032 expected. The coverage of the tests is still very limited,\n\
- \032 but the facility has already been very useful in debugging\n\
- \032 the new backup functionality (especially in exposing some\n\
- \032 subtle cross-platform issues).\n\
+ \032 expected. The coverage of the tests is still very limited, but\n\
+ \032 the facility has already been very useful in debugging the new\n\
+ \032 backup functionality (especially in exposing some subtle\n\
+ \032 cross-platform issues).\n\
\032 + Refined debugging code so that the verbosity of individual\n\
\032 modules can be controlled separately. Instead of just putting\n\
\032 '-debug verbose' on the command line, you can put '-debug\n\
@@ -3105,33 +3084,31 @@
\032 cooperation with external Harmony instances.\n\
\032 + Changed the temp file prefix from .# to .unison.\n\
\032 + Compressed the output from the text user interface\n\
- \032 (particularly when run with the -terse flag) to make it\n\
- \032 easier to interpret the results when Unison is run several\n\
- \032 times in succession from a script.\n\
+ \032 (particularly when run with the -terse flag) to make it easier\n\
+ \032 to interpret the results when Unison is run several times in\n\
+ \032 succession from a script.\n\
\032 + Diff and merge functions now work under Windows.\n\
- \032 + Changed the order of arguments to the default diff command\n\
- \032 (so that the + and - annotations in diff's output are\n\
- \032 reversed).\n\
+ \032 + Changed the order of arguments to the default diff command (so\n\
+ \032 that the + and - annotations in diff's output are reversed).\n\
\032 + Added .mpp files to the \"never fastcheck\" list (like .xls\n\
\032 files).\n\
\032 * Many small bugfixes, including:\n\
\032 + Fixed a longstanding bug regarding fastcheck and daylight\n\
- \032 saving time under Windows when Unison is set up to\n\
- \032 synchronize modification times. (Modification times cannot be\n\
- \032 updated in the archive in this case, so we have to ignore one\n\
- \032 hour differences.)\n\
+ \032 saving time under Windows when Unison is set up to synchronize\n\
+ \032 modification times. (Modification times cannot be updated in\n\
+ \032 the archive in this case, so we have to ignore one hour\n\
+ \032 differences.)\n\
\032 + Fixed a bug that would occasionally cause the archives to be\n\
\032 left in non-identical states on the two hosts after\n\
\032 synchronization.\n\
- \032 + Fixed a bug that prevented Unison from communicating\n\
- \032 correctly between 32- and 64-bit architectures.\n\
+ \032 + Fixed a bug that prevented Unison from communicating correctly\n\
+ \032 between 32- and 64-bit architectures.\n\
\032 + On windows, file creation times are no longer used as a proxy\n\
- \032 for inode numbers. (This is unfortunate, as it makes\n\
- \032 fastcheck a little less safe. But it turns out that file\n\
- \032 creation times are not reliable under Windows: if a file is\n\
- \032 removed and a new file is created in its place, the new one\n\
- \032 will sometimes be given the same creation date as the old\n\
- \032 one!)\n\
+ \032 for inode numbers. (This is unfortunate, as it makes fastcheck\n\
+ \032 a little less safe. But it turns out that file creation times\n\
+ \032 are not reliable under Windows: if a file is removed and a new\n\
+ \032 file is created in its place, the new one will sometimes be\n\
+ \032 given the same creation date as the old one!)\n\
\032 + Set read-only file to R/W on OSX before attempting to change\n\
\032 other attributes.\n\
\032 + Fixed bug resulting in spurious \"Aborted\" errors during\n\
@@ -3149,8 +3126,8 @@
\032 fail with the message \"Failed: Error in readWrite: Is a\n\
\032 directory.\"\n\
\032 + Replaced symlinks with copies of their targets in the Growl\n\
- \032 framework in src/uimac. This should make the sources easier\n\
- \032 to check out from the svn repository on WinXP systems.\n\
+ \032 framework in src/uimac. This should make the sources easier to\n\
+ \032 check out from the svn repository on WinXP systems.\n\
\032 + Added a workaround (suggested by Karl M.) for the problem\n\
\032 discussed on the unison users mailing list where, on the\n\
\032 Windows platform, the server would hang when transferring\n\
@@ -3158,14 +3135,13 @@
\032 mechanism, which was used to make a call back from the server\n\
\032 to the client (inside the Trace.log function) so that the log\n\
\032 message would be appended to the log file on the client. The\n\
- \032 workaround is to dump these messages (about when\n\
- \032 xferbycopying shortcuts are applied and whether they succeed)\n\
- \032 just to the standard output of the Unison process, not to the\n\
- \032 log file.\n\
+ \032 workaround is to dump these messages (about when xferbycopying\n\
+ \032 shortcuts are applied and whether they succeed) just to the\n\
+ \032 standard output of the Unison process, not to the log file.\n\
\n\
\032 Changes since 2.13.0:\n\
- \032 * The features for performing backups and for invoking external\n\
- \032 merge programs have been completely rewritten by Stephane Lescuyer\n\
+ \032 * The features for performing backups and for invoking external merge\n\
+ \032 programs have been completely rewritten by Stephane Lescuyer\n\
\032 (thanks, Stephane!). The user-visible functionality should not\n\
\032 change, but the internals have been rationalized and there are a\n\
\032 number of new features. See the manual (in particular, the\n\
@@ -3205,13 +3181,12 @@
\032 + Improved workaround for button focus problem (GTK2 UI)\n\
\032 + Put leading zeroes in date fields\n\
\032 + More robust handling of character encodings in GTK2 UI\n\
- \032 + Changed format of modification time displays, from modified\n\
- \032 at hh:mm:ss on dd MMM, yyyy to modified on yyyy-mm-dd\n\
- \032 hh:mm:ss\n\
- \032 + Changed time display to include seconds (so that people on\n\
- \032 FAT filesystems will not be confused when Unison tries to\n\
- \032 update a file time to an odd number of seconds and the\n\
- \032 filesystem truncates it to an even number!)\n\
+ \032 + Changed format of modification time displays, from modified at\n\
+ \032 hh:mm:ss on dd MMM, yyyy to modified on yyyy-mm-dd hh:mm:ss\n\
+ \032 + Changed time display to include seconds (so that people on FAT\n\
+ \032 filesystems will not be confused when Unison tries to update a\n\
+ \032 file time to an odd number of seconds and the filesystem\n\
+ \032 truncates it to an even number!)\n\
\032 + Use the diff \"-u\" option by default when showing differences\n\
\032 between files (the output is more readable)\n\
\032 + In text mode, pipe the diff output to a pager if the\n\
@@ -3239,13 +3214,13 @@
\032 + Disable multi-threading when both roots are local\n\
\032 + Improved error handling code. In particular, make sure all\n\
\032 files are closed in case of a transient failure\n\
- \032 + Under Windows, use $UNISON for home directory as a last\n\
- \032 resort (it was wrongly moved before $HOME and $USERPROFILE in\n\
- \032 Unison 2.12.0)\n\
+ \032 + Under Windows, use $UNISON for home directory as a last resort\n\
+ \032 (it was wrongly moved before $HOME and $USERPROFILE in Unison\n\
+ \032 2.12.0)\n\
\032 + Reopen the logfile if its name changes (profile change)\n\
- \032 + Double-check that permissions and modification times have\n\
- \032 been properly set: there are some combination of OS and\n\
- \032 filesystem on which setting them can fail in a silent way.\n\
+ \032 + Double-check that permissions and modification times have been\n\
+ \032 properly set: there are some combination of OS and filesystem\n\
+ \032 on which setting them can fail in a silent way.\n\
\032 + Check for bad Windows filenames for pure Windows\n\
\032 synchronization also (not just cross architecture\n\
\032 synchronization). This way, filenames containing backslashes,\n\
@@ -3257,8 +3232,8 @@
\032 + Ignore trailing dots in filenames in case insensitive mode\n\
\032 + Proper quoting of paths, files and extensions ignored using\n\
\032 the UI\n\
- \032 + The strings CURRENT1 and CURRENT2 are now correctly\n\
- \032 substitued when they occur in the diff preference\n\
+ \032 + The strings CURRENT1 and CURRENT2 are now correctly substitued\n\
+ \032 when they occur in the diff preference\n\
\032 + Improvements to syncing resource forks between Macs via a\n\
\032 non-Mac system.\n\
\n\
@@ -3268,6 +3243,7 @@
\032 Subversion. One nice side-effect is that anonymous checkout is now\n\
\032 possible, like this:\n\
\032 svn co https://cvs.cis.upenn.edu:3690/svnroot/unison/\n\
+ \n\
\032 We will also continue to export a \"developer tarball\" of the\n\
\032 current (modulo one day) sources in the web export directory. To\n\
\032 receive commit logs for changes to the sources, subscribe to the\n\
@@ -3296,18 +3272,17 @@
\032 + Fixed assertion failure when resolving a conflict content\n\
\032 change / permission changes in favor of the content change.\n\
\032 + Workaround for transferring large files using rsync.\n\
- \032 + Use buffered I/O for files (this is the only way to open\n\
- \032 files in binary mode under Cygwin).\n\
- \032 + On non-Cygwin Windows systems, the UNISON environment\n\
- \032 variable is now checked first to determine where to look for\n\
- \032 Unison's archive and preference files, followed by HOME and\n\
- \032 USERPROFILE in that order. On Unix and Cygwin systems, HOME\n\
- \032 is used.\n\
+ \032 + Use buffered I/O for files (this is the only way to open files\n\
+ \032 in binary mode under Cygwin).\n\
+ \032 + On non-Cygwin Windows systems, the UNISON environment variable\n\
+ \032 is now checked first to determine where to look for Unison's\n\
+ \032 archive and preference files, followed by HOME and USERPROFILE\n\
+ \032 in that order. On Unix and Cygwin systems, HOME is used.\n\
\032 + Generalized diff preference so that it can be given either as\n\
- \032 just the command name to be used for calculating diffs or\n\
- \032 else a whole command line, containing the strings CURRENT1\n\
- \032 and CURRENT2, which will be replaced by the names of the\n\
- \032 files to be diff'ed before the command is called.\n\
+ \032 just the command name to be used for calculating diffs or else\n\
+ \032 a whole command line, containing the strings CURRENT1 and\n\
+ \032 CURRENT2, which will be replaced by the names of the files to\n\
+ \032 be diff'ed before the command is called.\n\
\032 + Recognize password prompts in some newer versions of ssh.\n\
\n\
\032 Changes since 2.9.20:\n\
@@ -3316,13 +3291,13 @@
\032 + Major tidying and enhancement of 'merge' functionality. The\n\
\032 main user-visible change is that the external merge program\n\
\032 may either write the merged output to a single new file, as\n\
- \032 before, or it may modify one or both of its input files, or\n\
- \032 it may write two new files. In the latter cases, its\n\
- \032 modifications will be copied back into place on both the\n\
- \032 local and the remote host, and (if the two files are now\n\
- \032 equal) the archive will be updated appropriately. More\n\
- \032 information can be found in the user manual. Thanks to Malo\n\
- \032 Denielou and Alan Schmitt for these improvements.\n\
+ \032 before, or it may modify one or both of its input files, or it\n\
+ \032 may write two new files. In the latter cases, its\n\
+ \032 modifications will be copied back into place on both the local\n\
+ \032 and the remote host, and (if the two files are now equal) the\n\
+ \032 archive will be updated appropriately. More information can be\n\
+ \032 found in the user manual. Thanks to Malo Denielou and Alan\n\
+ \032 Schmitt for these improvements.\n\
\032 Warning: the new merging functionality is not completely\n\
\032 compatible with old versions! Check the manual for details.\n\
\032 + Files larger than 2Gb are now supported.\n\
@@ -3336,8 +3311,8 @@
\032 Unison's archives, preference files, etc., is now\n\
\032 determined as follows:\n\
\032 # if ~/.unison exists, use it\n\
- \032 # otherwise, use ~/Library/Application\n\
- \032 Support/Unison, creating it if necessary.\n\
+ \032 # otherwise, use ~/Library/Application Support/Unison,\n\
+ \032 creating it if necessary.\n\
\032 o A preliminary native-Cocoa user interface is under\n\
\032 construction. This still needs some work, and some users\n\
\032 experience unpredictable crashes, so it is only for\n\
@@ -3352,25 +3327,24 @@
\032 directory matches one of the patterns set in this preference,\n\
\032 then update detection is skipped for files in this directory.\n\
\032 (The purpose is to speed update detection for cases like Mail\n\
- \032 folders, which contain lots and lots of immutable files.)\n\
- \032 Also a preference assumeContentsAreImmutableNot, which\n\
- \032 overrides the first, similarly to ignorenot. (Later\n\
- \032 amendment: these preferences are now called immutable and\n\
- \032 immutablenot.)\n\
+ \032 folders, which contain lots and lots of immutable files.) Also\n\
+ \032 a preference assumeContentsAreImmutableNot, which overrides\n\
+ \032 the first, similarly to ignorenot. (Later amendment: these\n\
+ \032 preferences are now called immutable and immutablenot.)\n\
\032 + The ignorecase flag has been changed from a boolean to a\n\
\032 three-valued preference. The default setting, called default,\n\
\032 checks the operating systems running on the client and server\n\
- \032 and ignores filename case if either of them is OSX or\n\
- \032 Windows. Setting ignorecase to true or false overrides this\n\
- \032 behavior. If you have been setting ignorecase on the command\n\
- \032 line using -ignorecase=true or -ignorecase=false, you will\n\
- \032 need to change to -ignorecase true or -ignorecase false.\n\
+ \032 and ignores filename case if either of them is OSX or Windows.\n\
+ \032 Setting ignorecase to true or false overrides this behavior.\n\
+ \032 If you have been setting ignorecase on the command line using\n\
+ \032 -ignorecase=true or -ignorecase=false, you will need to change\n\
+ \032 to -ignorecase true or -ignorecase false.\n\
\032 + a new preference, 'repeat', for the text user interface\n\
\032 (only). If 'repeat' is set to a number, then, after it\n\
- \032 finishes synchronizing, Unison will wait for that many\n\
- \032 seconds and then start over, continuing this way until it is\n\
- \032 killed from outside. Setting repeat to true will\n\
- \032 automatically set the batch preference to true.\n\
+ \032 finishes synchronizing, Unison will wait for that many seconds\n\
+ \032 and then start over, continuing this way until it is killed\n\
+ \032 from outside. Setting repeat to true will automatically set\n\
+ \032 the batch preference to true.\n\
\032 + Excel files are now handled specially, so that the fastcheck\n\
\032 optimization is skipped even if the fastcheck flag is set.\n\
\032 (Excel does some naughty things with modtimes, making this\n\
@@ -3385,16 +3359,16 @@
\032 + Added a new preference, 'repeat', for the text user interface\n\
\032 (only, at the moment). If 'repeat' is set to a number, then,\n\
\032 after it finishes synchronizing, Unison will wait for that\n\
- \032 many seconds and then start over, continuing this way until\n\
- \032 it is killed from outside. Setting repeat to true will\n\
+ \032 many seconds and then start over, continuing this way until it\n\
+ \032 is killed from outside. Setting repeat to true will\n\
\032 automatically set the batch preference to true.\n\
\032 + The 'rshargs' preference has been split into 'rshargs' and\n\
- \032 'sshargs' (mainly to make the documentation clearer). In\n\
- \032 fact, 'rshargs' is no longer mentioned in the documentation\n\
- \032 at all, since pretty much everybody uses ssh now anyway.\n\
+ \032 'sshargs' (mainly to make the documentation clearer). In fact,\n\
+ \032 'rshargs' is no longer mentioned in the documentation at all,\n\
+ \032 since pretty much everybody uses ssh now anyway.\n\
\032 * Documentation\n\
- \032 + The web pages have been completely redesigned and\n\
- \032 reorganized. (Thanks to Alan Schmitt for help with this.)\n\
+ \032 + The web pages have been completely redesigned and reorganized.\n\
+ \032 (Thanks to Alan Schmitt for help with this.)\n\
\032 * User interface improvements\n\
\032 + Added a GTK2 user interface, capable (among other things) of\n\
\032 displaying filenames in any locale encoding. Kudos to Stephen\n\
@@ -3403,8 +3377,8 @@
\032 at the end of synchronization.\n\
\032 + Restarting update detection from the graphical UI will reload\n\
\032 the current profile (which in particular will reset the -path\n\
- \032 preference, in case it has been narrowed by using the\n\
- \032 \"Recheck unsynchronized items\" command).\n\
+ \032 preference, in case it has been narrowed by using the \"Recheck\n\
+ \032 unsynchronized items\" command).\n\
\032 + Several small improvements to the text user interface,\n\
\032 including a progress display.\n\
\032 * Bug fixes (too numerous to count, actually, but here are some):\n\
@@ -3438,8 +3412,8 @@
\032 Changes since 2.9.1:\n\
\032 * Added a preference maxthreads that can be used to limit the number\n\
\032 of simultaneous file transfers.\n\
- \032 * Added a backupdir preference, which controls where backup files\n\
- \032 are stored.\n\
+ \032 * Added a backupdir preference, which controls where backup files are\n\
+ \032 stored.\n\
\032 * Basic support added for OSX. In particular, Unison now recognizes\n\
\032 when one of the hosts being synchronized is running OSX and\n\
\032 switches to a case-insensitive treatment of filenames (i.e., 'foo'\n\
@@ -3463,15 +3437,14 @@
\032 tuning.\n\
\032 * Makefile\n\
\032 + Makefile.OCaml now sets UISTYLE=text or UISTYLE=gtk\n\
- \032 automatically, depending on whether it finds lablgtk\n\
- \032 installed\n\
+ \032 automatically, depending on whether it finds lablgtk installed\n\
\032 + Unison should now compile \"out of the box\" under OSX\n\
\n\
\032 Changes since 2.8.1:\n\
\032 * Changing profile works again under Windows\n\
\032 * File movement optimization: Unison now tries to use local copy\n\
- \032 instead of transfer for moved or copied files. It is controled by\n\
- \032 a boolean option \"xferbycopying\".\n\
+ \032 instead of transfer for moved or copied files. It is controled by a\n\
+ \032 boolean option \"xferbycopying\".\n\
\032 * Network statistics window (transfer rate, amount of data\n\
\032 transferred). [NB: not available in Windows-Cygwin version.]\n\
\032 * symlinks work under the cygwin version (which is dynamically\n\
@@ -3480,8 +3453,8 @@
\032 Unix\n\
\032 * Small improvements:\n\
\032 + If neither the USERPROFILE nor the HOME environment variables\n\
- \032 are set, then Unison will put its temporary commit log\n\
- \032 (called DANGER.README) into the directory named by the UNISON\n\
+ \032 are set, then Unison will put its temporary commit log (called\n\
+ \032 DANGER.README) into the directory named by the UNISON\n\
\032 environment variable, if any; otherwise it will use C:.\n\
\032 + alternative set of values for fastcheck: yes = true; no =\n\
\032 false; default = auto.\n\
@@ -3496,13 +3469,13 @@
\032 anymore.\n\
\n\
\032 Changes since 2.7.78:\n\
- \032 * Small bugfix to textual user interface under Unix (to avoid\n\
- \032 leaving the terminal in a bad state where it would not echo inputs\n\
- \032 after Unison exited).\n\
+ \032 * Small bugfix to textual user interface under Unix (to avoid leaving\n\
+ \032 the terminal in a bad state where it would not echo inputs after\n\
+ \032 Unison exited).\n\
\n\
\032 Changes since 2.7.39:\n\
- \032 * Improvements to the main web page (stable and beta version docs\n\
- \032 are now both accessible).\n\
+ \032 * Improvements to the main web page (stable and beta version docs are\n\
+ \032 now both accessible).\n\
\032 * User manual revised.\n\
\032 * Added some new preferences:\n\
\032 + \"sshcmd\" and \"rshcmd\" for specifying paths to ssh and rsh\n\
@@ -3526,34 +3499,34 @@
\032 * User interface and Unison behavior:\n\
\032 + Renamed `Proceed' to `Go' in the graphical UI.\n\
\032 + Added exit status for the textual user interface.\n\
- \032 + Paths that are not synchronized because of conflicts or\n\
- \032 errors during update detection are now noted in the log file.\n\
+ \032 + Paths that are not synchronized because of conflicts or errors\n\
+ \032 during update detection are now noted in the log file.\n\
\032 + [END] messages in log now use a briefer format\n\
- \032 + Changed the text UI startup sequence so that ./unison -ui\n\
- \032 text will use the default profile instead of failing.\n\
+ \032 + Changed the text UI startup sequence so that ./unison -ui text\n\
+ \032 will use the default profile instead of failing.\n\
\032 + Made some improvements to the error messages.\n\
\032 + Added some debugging messages to remote.ml.\n\
\n\
\032 Changes since 2.7.7:\n\
- \032 * Incorporated, once again, a multi-threaded transport sub-system.\n\
- \032 It transfers several files at the same time, thereby making much\n\
- \032 more effective use of available network bandwidth. Unlike the\n\
- \032 earlier attempt, this time we do not rely on the native thread\n\
- \032 library of OCaml. Instead, we implement a light-weight,\n\
- \032 non-preemptive multi-thread library in OCaml directly. This\n\
- \032 version appears stable.\n\
+ \032 * Incorporated, once again, a multi-threaded transport sub-system. It\n\
+ \032 transfers several files at the same time, thereby making much more\n\
+ \032 effective use of available network bandwidth. Unlike the earlier\n\
+ \032 attempt, this time we do not rely on the native thread library of\n\
+ \032 OCaml. Instead, we implement a light-weight, non-preemptive\n\
+ \032 multi-thread library in OCaml directly. This version appears\n\
+ \032 stable.\n\
\032 Some adjustments to unison are made to accommodate the\n\
\032 multi-threaded version. These include, in particular, changes to\n\
\032 the user interface and logging, for example:\n\
\032 + Two log entries for each transferring task, one for the\n\
\032 beginning, one for the end.\n\
\032 + Suppressed warning messages against removing temp files left\n\
- \032 by a previous unison run, because warning does not work\n\
- \032 nicely under multi-threading. The temp file names are made\n\
- \032 less likely to coincide with the name of a file created by\n\
- \032 the user. They take the form\n\
- \032 .#<filename>.<serial>.unison.tmp. [N.b. This was later\n\
- \032 changed to .unison.<filename>.<serial>.unison.tmp.]\n\
+ \032 by a previous unison run, because warning does not work nicely\n\
+ \032 under multi-threading. The temp file names are made less\n\
+ \032 likely to coincide with the name of a file created by the\n\
+ \032 user. They take the form\n\
+ \032 .#<filename>.<serial>.unison.tmp. [N.b. This was later changed\n\
+ \032 to .unison.<filename>.<serial>.unison.tmp.]\n\
\032 * Added a new command to the GTK user interface: pressing 'f' causes\n\
\032 Unison to start a new update detection phase, using as paths just\n\
\032 those paths that have been detected as changed and not yet marked\n\
@@ -3561,17 +3534,16 @@
\032 Unison on just the set of paths still needing attention after a\n\
\032 previous run.\n\
\032 * Made the ignorecase preference user-visible, and changed the\n\
- \032 initialization code so that it can be manually set to true, even\n\
- \032 if neither host is running Windows. (This may be useful, e.g.,\n\
- \032 when using Unison running on a Unix system with a FAT volume\n\
- \032 mounted.)\n\
+ \032 initialization code so that it can be manually set to true, even if\n\
+ \032 neither host is running Windows. (This may be useful, e.g., when\n\
+ \032 using Unison running on a Unix system with a FAT volume mounted.)\n\
\032 * Small improvements and bug fixes:\n\
\032 + Errors in preference files now generate fatal errors rather\n\
\032 than warnings at startup time. (I.e., you can't go on from\n\
- \032 them.) Also, we fixed a bug that was preventing these\n\
- \032 warnings from appearing in the text UI, so some users who\n\
- \032 have been running (unsuspectingly) with garbage in their\n\
- \032 prefs files may now get error reports.\n\
+ \032 them.) Also, we fixed a bug that was preventing these warnings\n\
+ \032 from appearing in the text UI, so some users who have been\n\
+ \032 running (unsuspectingly) with garbage in their prefs files may\n\
+ \032 now get error reports.\n\
\032 + Error reporting for preference files now provides file name\n\
\032 and line number.\n\
\032 + More intelligible message in the case of identical change to\n\
@@ -3591,8 +3563,8 @@
\032 1.2.3 library (patched version used for compiling under\n\
\032 Windows).\n\
\032 + Added the option to compile unison on the Windows platform\n\
- \032 with Cygwin GNU C compiler. This option only supports\n\
- \032 building dynamically linked unison executables.\n\
+ \032 with Cygwin GNU C compiler. This option only supports building\n\
+ \032 dynamically linked unison executables.\n\
\n\
\032 Changes since 2.7.4:\n\
\032 * Fixed a silly (but debilitating) bug in the client startup\n\
@@ -3604,10 +3576,10 @@
\032 added to.\n\
\032 * Bug fix: read the initial connection header one byte at a time, so\n\
\032 that we don't block if the header is shorter than expected. (This\n\
- \032 bug did not affect normal operation -- it just made it hard to\n\
- \032 tell when you were trying to use Unison incorrectly with an old\n\
- \032 version of the server, since it would hang instead of giving an\n\
- \032 error message.)\n\
+ \032 bug did not affect normal operation -- it just made it hard to tell\n\
+ \032 when you were trying to use Unison incorrectly with an old version\n\
+ \032 of the server, since it would hang instead of giving an error\n\
+ \032 message.)\n\
\n\
\032 Changes since 2.6.59:\n\
\032 * Changed fastcheck from a boolean to a string preference. Its legal\n\
@@ -3617,16 +3589,15 @@
\032 default.\n\
\032 * Several preferences have been renamed for consistency. All\n\
\032 preference names are now spelled out in lowercase. For backward\n\
- \032 compatibility, the old names still work, but they are not\n\
- \032 mentioned in the manual any more.\n\
+ \032 compatibility, the old names still work, but they are not mentioned\n\
+ \032 in the manual any more.\n\
\032 * The temp files created by the 'diff' and 'merge' commands are now\n\
\032 named by prepending a new prefix to the file name, rather than\n\
- \032 appending a suffix. This should avoid confusing diff/merge\n\
- \032 programs that depend on the suffix to guess the type of the file\n\
- \032 contents.\n\
+ \032 appending a suffix. This should avoid confusing diff/merge programs\n\
+ \032 that depend on the suffix to guess the type of the file contents.\n\
\032 * We now set the keepalive option on the server socket, to make sure\n\
- \032 that the server times out if the communication link is\n\
- \032 unexpectedly broken.\n\
+ \032 that the server times out if the communication link is unexpectedly\n\
+ \032 broken.\n\
\032 * Bug fixes:\n\
\032 + When updating small files, Unison now closes the destination\n\
\032 file.\n\
@@ -3636,10 +3607,10 @@
\n\
\032 Changes since 2.6.38:\n\
\032 * Major Windows performance improvement!\n\
- \032 We've added a preference fastcheck that makes Unison look only at\n\
- \032 a file's creation time and last-modified time to check whether it\n\
- \032 has changed. This should result in a huge speedup when checking\n\
- \032 for updates in large replicas.\n\
+ \032 We've added a preference fastcheck that makes Unison look only at a\n\
+ \032 file's creation time and last-modified time to check whether it has\n\
+ \032 changed. This should result in a huge speedup when checking for\n\
+ \032 updates in large replicas.\n\
\032 When this switch is set, Unison will use file creation times as\n\
\032 'pseudo inode numbers' when scanning Windows replicas for updates,\n\
\032 instead of reading the full contents of every file. This may cause\n\
@@ -3658,30 +3629,29 @@
\032 * New functionality: centralized backups and merging\n\
\032 + This version incorporates two pieces of major new\n\
\032 functionality, implemented by Sylvain Roy during a summer\n\
- \032 internship at Penn: a centralized backup facility that keeps\n\
- \032 a full backup of (selected files in) each replica, and a\n\
- \032 merging feature that allows Unison to invoke an external\n\
- \032 file-merging tool to resolve conflicting changes to\n\
- \032 individual files.\n\
+ \032 internship at Penn: a centralized backup facility that keeps a\n\
+ \032 full backup of (selected files in) each replica, and a merging\n\
+ \032 feature that allows Unison to invoke an external file-merging\n\
+ \032 tool to resolve conflicting changes to individual files.\n\
\032 + Centralized backups:\n\
\032 o Unison now maintains full backups of the\n\
- \032 last-synchronized versions of (some of) the files in\n\
- \032 each replica; these function both as backups in the\n\
- \032 usual sense and as the \"common version\" when invoking\n\
- \032 external merge programs.\n\
+ \032 last-synchronized versions of (some of) the files in each\n\
+ \032 replica; these function both as backups in the usual\n\
+ \032 sense and as the \"common version\" when invoking external\n\
+ \032 merge programs.\n\
\032 o The backed up files are stored in a directory\n\
- \032 /.unison/backup on each host. (The name of this\n\
- \032 directory can be changed by setting the environment\n\
- \032 variable UNISONBACKUPDIR.)\n\
+ \032 /.unison/backup on each host. (The name of this directory\n\
+ \032 can be changed by setting the environment variable\n\
+ \032 UNISONBACKUPDIR.)\n\
\032 o The predicate backup controls which files are actually\n\
- \032 backed up: giving the preference 'backup = Path *'\n\
- \032 causes backing up of all files.\n\
+ \032 backed up: giving the preference 'backup = Path *' causes\n\
+ \032 backing up of all files.\n\
\032 o Files are added to the backup directory whenever unison\n\
\032 updates its archive. This means that\n\
\032 # When unison reconstructs its archive from scratch\n\
- \032 (e.g., because of an upgrade, or because the\n\
- \032 archive files have been manually deleted), all\n\
- \032 files will be backed up.\n\
+ \032 (e.g., because of an upgrade, or because the archive\n\
+ \032 files have been manually deleted), all files will be\n\
+ \032 backed up.\n\
\032 # Otherwise, each file will be backed up the first\n\
\032 time unison propagates an update for it.\n\
\032 o The preference backupversions controls how many previous\n\
@@ -3690,23 +3660,23 @@
\032 o For backward compatibility, the backups preference is\n\
\032 also still supported, but backup is now preferred.\n\
\032 o It is OK to manually delete files from the backup\n\
- \032 directory (or to throw away the directory itself).\n\
- \032 Before unison uses any of these files for anything\n\
- \032 important, it checks that its fingerprint matches the\n\
- \032 one that it expects.\n\
+ \032 directory (or to throw away the directory itself). Before\n\
+ \032 unison uses any of these files for anything important, it\n\
+ \032 checks that its fingerprint matches the one that it\n\
+ \032 expects.\n\
\032 + Merging:\n\
- \032 o Both user interfaces offer a new 'merge' command,\n\
- \032 invoked by pressing 'm' (with a changed file selected).\n\
+ \032 o Both user interfaces offer a new 'merge' command, invoked\n\
+ \032 by pressing 'm' (with a changed file selected).\n\
\032 o The actual merging is performed by an external program.\n\
- \032 The preferences merge and merge2 control how this\n\
- \032 program is invoked. If a backup exists for this file\n\
- \032 (see the backup preference), then the merge preference\n\
- \032 is used for this purpose; otherwise merge2 is used. In\n\
- \032 both cases, the value of the preference should be a\n\
- \032 string representing the command that should be passed to\n\
- \032 a shell to invoke the merge program. Within this string,\n\
- \032 the special substrings CURRENT1, CURRENT2, NEW, and OLD\n\
- \032 may appear at any point. Unison will substitute these as\n\
+ \032 The preferences merge and merge2 control how this program\n\
+ \032 is invoked. If a backup exists for this file (see the\n\
+ \032 backup preference), then the merge preference is used for\n\
+ \032 this purpose; otherwise merge2 is used. In both cases,\n\
+ \032 the value of the preference should be a string\n\
+ \032 representing the command that should be passed to a shell\n\
+ \032 to invoke the merge program. Within this string, the\n\
+ \032 special substrings CURRENT1, CURRENT2, NEW, and OLD may\n\
+ \032 appear at any point. Unison will substitute these as\n\
\032 follows before invoking the command:\n\
\032 # CURRENT1 is replaced by the name of the local copy\n\
\032 of the file;\n\
@@ -3714,18 +3684,18 @@
\032 file, into which the contents of the remote copy of\n\
\032 the file have been transferred by Unison prior to\n\
\032 performing the merge;\n\
- \032 # NEW is replaced by the name of a temporary file\n\
- \032 that Unison expects to be written by the merge\n\
- \032 program when it finishes, giving the desired new\n\
- \032 contents of the file; and\n\
- \032 # OLD is replaced by the name of the backed up copy\n\
- \032 of the original version of the file (i.e., its\n\
- \032 state at the end of the last successful run of\n\
- \032 Unison), if one exists (applies only to merge, not\n\
- \032 merge2).\n\
- \032 For example, on Unix systems setting the merge\n\
- \032 preference to\n\
+ \032 # NEW is replaced by the name of a temporary file that\n\
+ \032 Unison expects to be written by the merge program\n\
+ \032 when it finishes, giving the desired new contents of\n\
+ \032 the file; and\n\
+ \032 # OLD is replaced by the name of the backed up copy of\n\
+ \032 the original version of the file (i.e., its state at\n\
+ \032 the end of the last successful run of Unison), if\n\
+ \032 one exists (applies only to merge, not merge2).\n\
+ \032 For example, on Unix systems setting the merge preference\n\
+ \032 to\n\
\032 merge = diff3 -m CURRENT1 OLD CURRENT2 > NEW\n\
+ \n\
\032 will tell Unison to use the external diff3 program for\n\
\032 merging.\n\
\032 A large number of external merging programs are\n\
@@ -3735,43 +3705,44 @@
\032 nil \"NEW\")'\n\
\032 merge = emacs -q --eval '(ediff-merge-files-with-ancestor\n\
\032 \"CURRENT1\" \"CURRENT2\" \"OLD\" nil \"NEW\")'\n\
+ \n\
\032 (These commands are displayed here on two lines to avoid\n\
\032 running off the edge of the page. In your preference\n\
\032 file, each should be written on a single line.)\n\
- \032 o If the external program exits without leaving any file\n\
- \032 at the path NEW, Unison considers the merge to have\n\
- \032 failed. If the merge program writes a file called NEW\n\
- \032 but exits with a non-zero status code, then Unison\n\
- \032 considers the merge to have succeeded but to have\n\
- \032 generated conflicts. In this case, it attempts to invoke\n\
- \032 an external editor so that the user can resolve the\n\
- \032 conflicts. The value of the editor preference controls\n\
- \032 what editor is invoked by Unison. The default is emacs.\n\
- \032 o Please send us suggestions for other useful values of\n\
- \032 the merge2 and merge preferences - we'd like to give\n\
- \032 several examples in the manual.\n\
+ \032 o If the external program exits without leaving any file at\n\
+ \032 the path NEW, Unison considers the merge to have failed.\n\
+ \032 If the merge program writes a file called NEW but exits\n\
+ \032 with a non-zero status code, then Unison considers the\n\
+ \032 merge to have succeeded but to have generated conflicts.\n\
+ \032 In this case, it attempts to invoke an external editor so\n\
+ \032 that the user can resolve the conflicts. The value of the\n\
+ \032 editor preference controls what editor is invoked by\n\
+ \032 Unison. The default is emacs.\n\
+ \032 o Please send us suggestions for other useful values of the\n\
+ \032 merge2 and merge preferences - we'd like to give several\n\
+ \032 examples in the manual.\n\
\032 * Smaller changes:\n\
\032 + When one preference file includes another, unison no longer\n\
\032 adds the suffix '.prf' to the included file by default. If a\n\
\032 file with precisely the given name exists in the .unison\n\
- \032 directory, it will be used; otherwise Unison will add .prf,\n\
- \032 as it did before. (This change means that included preference\n\
+ \032 directory, it will be used; otherwise Unison will add .prf, as\n\
+ \032 it did before. (This change means that included preference\n\
\032 files can be named blah.include instead of blah.prf, so that\n\
\032 unison will not offer them in its 'choose a preference file'\n\
\032 dialog.)\n\
- \032 + For Linux systems, we now offer both a statically linked and\n\
- \032 a dynamically linked executable. The static one is larger,\n\
- \032 but will probably run on more systems, since it doesn't\n\
- \032 depend on the same versions of dynamically linked library\n\
- \032 modules being available.\n\
- \032 + Fixed the force and prefer preferences, which were getting\n\
- \032 the propagation direction exactly backwards.\n\
+ \032 + For Linux systems, we now offer both a statically linked and a\n\
+ \032 dynamically linked executable. The static one is larger, but\n\
+ \032 will probably run on more systems, since it doesn't depend on\n\
+ \032 the same versions of dynamically linked library modules being\n\
+ \032 available.\n\
+ \032 + Fixed the force and prefer preferences, which were getting the\n\
+ \032 propagation direction exactly backwards.\n\
\032 + Fixed a bug in the startup code that would cause unison to\n\
\032 crash when the default profile (~/.unison/default.prf) does\n\
\032 not exist.\n\
- \032 + Fixed a bug where, on the run when a profile is first\n\
- \032 created, Unison would confusingly display the roots in\n\
- \032 reverse order in the user interface.\n\
+ \032 + Fixed a bug where, on the run when a profile is first created,\n\
+ \032 Unison would confusingly display the roots in reverse order in\n\
+ \032 the user interface.\n\
\032 * For developers:\n\
\032 + We've added a module dependency diagram to the source\n\
\032 distribution, in src/DEPENDENCIES.ps, to help new prospective\n\
@@ -3781,10 +3752,10 @@
\032 * INCOMPATIBLE CHANGE: Archive format has changed.\n\
\032 * INCOMPATIBLE CHANGE: The startup sequence has been completely\n\
\032 rewritten and greatly simplified. The main user-visible change is\n\
- \032 that the defaultpath preference has been removed. Its effect can\n\
- \032 be approximated by using multiple profiles, with include\n\
- \032 directives to incorporate common settings. All uses of defaultpath\n\
- \032 in existing profiles should be changed to path.\n\
+ \032 that the defaultpath preference has been removed. Its effect can be\n\
+ \032 approximated by using multiple profiles, with include directives to\n\
+ \032 incorporate common settings. All uses of defaultpath in existing\n\
+ \032 profiles should be changed to path.\n\
\032 Another change in startup behavior that will affect some users is\n\
\032 that it is no longer possible to specify roots both in the profile\n\
\032 and on the command line.\n\
@@ -3798,17 +3769,18 @@
\n\
\032 common.prf =\n\
\032 <everything else>\n\
+ \n\
\032 Now do\n\
\032 unison common root1 root2\n\
+ \n\
\032 when you want to specify roots explicitly.\n\
- \032 * The -prefer and -force options have been extended to allow users\n\
- \032 to specify that files with more recent modtimes should be\n\
- \032 propagated, writing either -prefer newer or -force newer. (For\n\
- \032 symmetry, Unison will also accept -prefer older or -force older.)\n\
- \032 The -force older/newer options can only be used when -times is\n\
- \032 also set.\n\
- \032 The graphical user interface provides access to these facilities\n\
- \032 on a one-off basis via the Actions menu.\n\
+ \032 * The -prefer and -force options have been extended to allow users to\n\
+ \032 specify that files with more recent modtimes should be propagated,\n\
+ \032 writing either -prefer newer or -force newer. (For symmetry, Unison\n\
+ \032 will also accept -prefer older or -force older.) The -force\n\
+ \032 older/newer options can only be used when -times is also set.\n\
+ \032 The graphical user interface provides access to these facilities on\n\
+ \032 a one-off basis via the Actions menu.\n\
\032 * Names of roots can now be \"aliased\" to allow replicas to be\n\
\032 relocated without changing the name of the archive file where\n\
\032 Unison stores information between runs. (This feature is for\n\
@@ -3822,25 +3794,24 @@
\032 profiles. If a profile contains a preference of the form 'key\n\
\032 = n', where n is a single digit, then pressing this key will\n\
\032 cause Unison to immediately switch to this profile and begin\n\
- \032 synchronization again from scratch. (Any actions that may\n\
- \032 have been selected for a set of changes currently being\n\
- \032 displayed will be discarded.)\n\
+ \032 synchronization again from scratch. (Any actions that may have\n\
+ \032 been selected for a set of changes currently being displayed\n\
+ \032 will be discarded.)\n\
\032 + Each profile may include a preference 'label = <string>'\n\
\032 giving a descriptive string that described the options\n\
\032 selected in this profile. The string is listed along with the\n\
- \032 profile name in the profile selection dialog, and displayed\n\
- \032 in the top-right corner of the main Unison window.\n\
+ \032 profile name in the profile selection dialog, and displayed in\n\
+ \032 the top-right corner of the main Unison window.\n\
\032 * Minor:\n\
\032 + Fixed a bug that would sometimes cause the 'diff' display to\n\
- \032 order the files backwards relative to the main user\n\
- \032 interface. (Thanks to Pascal Brisset for this fix.)\n\
+ \032 order the files backwards relative to the main user interface.\n\
+ \032 (Thanks to Pascal Brisset for this fix.)\n\
\032 + On Unix systems, the graphical version of Unison will check\n\
- \032 the DISPLAY variable and, if it is not set, automatically\n\
- \032 fall back to the textual user interface.\n\
+ \032 the DISPLAY variable and, if it is not set, automatically fall\n\
+ \032 back to the textual user interface.\n\
\032 + Synchronization paths (path preferences) are now matched\n\
- \032 against the ignore preferences. So if a path is both\n\
- \032 specified in a path preference and ignored, it will be\n\
- \032 skipped.\n\
+ \032 against the ignore preferences. So if a path is both specified\n\
+ \032 in a path preference and ignored, it will be skipped.\n\
\032 + Numerous other bugfixes and small improvements.\n\
\n\
\032 Changes since 2.6.1:\n\
@@ -3876,15 +3847,14 @@
\032 * New functionality:\n\
\032 + Unison now synchronizes file modtimes, user-ids, and\n\
\032 group-ids.\n\
- \032 These new features are controlled by a set of new\n\
- \032 preferences, all of which are currently false by default.\n\
+ \032 These new features are controlled by a set of new preferences,\n\
+ \032 all of which are currently false by default.\n\
\032 o When the times preference is set to true, file\n\
\032 modification times are propaged. (Because the\n\
- \032 representations of time may not have the same\n\
- \032 granularity on both replicas, Unison may not always be\n\
- \032 able to make the modtimes precisely equal, but it will\n\
- \032 get them as close as the operating systems involved\n\
- \032 allow.)\n\
+ \032 representations of time may not have the same granularity\n\
+ \032 on both replicas, Unison may not always be able to make\n\
+ \032 the modtimes precisely equal, but it will get them as\n\
+ \032 close as the operating systems involved allow.)\n\
\032 o When the owner preference is set to true, file ownership\n\
\032 information is synchronized.\n\
\032 o When the group preference is set to true, group\n\
@@ -3902,34 +3872,33 @@
\032 be synchronized. It is set by default to 0o1777: all bits but\n\
\032 the set-uid and set-gid bits are synchronised (synchronizing\n\
\032 theses latter bits can be a security hazard). If you want to\n\
- \032 synchronize all bits, you can set the value of this\n\
- \032 preference to -1.\n\
+ \032 synchronize all bits, you can set the value of this preference\n\
+ \032 to -1.\n\
\032 + Added a log preference (default false), which makes Unison\n\
\032 keep a complete record of the changes it makes to the\n\
\032 replicas. By default, this record is written to a file called\n\
- \032 unison.log in the user's home directory (the value of the\n\
- \032 HOME environment variable). If you want it someplace else,\n\
- \032 set the logfile preference to the full pathname you want\n\
- \032 Unison to use.\n\
- \032 + Added an ignorenot preference that maintains a set of\n\
- \032 patterns for paths that should definitely not be ignored,\n\
- \032 whether or not they match an ignore pattern. (That is, a path\n\
- \032 will now be ignored iff it matches an ignore pattern and does\n\
- \032 not match any ignorenot patterns.)\n\
+ \032 unison.log in the user's home directory (the value of the HOME\n\
+ \032 environment variable). If you want it someplace else, set the\n\
+ \032 logfile preference to the full pathname you want Unison to\n\
+ \032 use.\n\
+ \032 + Added an ignorenot preference that maintains a set of patterns\n\
+ \032 for paths that should definitely not be ignored, whether or\n\
+ \032 not they match an ignore pattern. (That is, a path will now be\n\
+ \032 ignored iff it matches an ignore pattern and does not match\n\
+ \032 any ignorenot patterns.)\n\
\032 * User-interface improvements:\n\
\032 + Roots are now displayed in the user interface in the same\n\
\032 order as they were given on the command line or in the\n\
\032 preferences file.\n\
- \032 + When the batch preference is set, the graphical user\n\
- \032 interface no longer waits for user confirmation when it\n\
- \032 displays a warning message: it simply pops up an advisory\n\
- \032 window with a Dismiss button at the bottom and keeps on\n\
- \032 going.\n\
+ \032 + When the batch preference is set, the graphical user interface\n\
+ \032 no longer waits for user confirmation when it displays a\n\
+ \032 warning message: it simply pops up an advisory window with a\n\
+ \032 Dismiss button at the bottom and keeps on going.\n\
\032 + Added a new preference for controlling how many status\n\
\032 messages are printed during update detection: statusdepth\n\
\032 controls the maximum depth for paths on the local machine\n\
- \032 (longer paths are not displayed, nor are non-directory\n\
- \032 paths). The value should be an integer; default is 1.\n\
+ \032 (longer paths are not displayed, nor are non-directory paths).\n\
+ \032 The value should be an integer; default is 1.\n\
\032 + Removed the trace and silent preferences. They did not seem\n\
\032 very useful, and there were too many preferences for\n\
\032 controlling output in various ways.\n\
@@ -3941,11 +3910,11 @@
\032 host (which is used, for example, in calculating the name of\n\
\032 the archive file used to remember which files have been\n\
\032 synchronized) normally uses the gethostname operating system\n\
- \032 call. However, if the environment variable\n\
- \032 UNISONLOCALHOSTNAME is set, its value will now be used\n\
- \032 instead. This makes it easier to use Unison in situations\n\
- \032 where a machine's name changes frequently (e.g., because it\n\
- \032 is a laptop and gets moved around a lot).\n\
+ \032 call. However, if the environment variable UNISONLOCALHOSTNAME\n\
+ \032 is set, its value will now be used instead. This makes it\n\
+ \032 easier to use Unison in situations where a machine's name\n\
+ \032 changes frequently (e.g., because it is a laptop and gets\n\
+ \032 moved around a lot).\n\
\032 + File owner and group are now displayed in the \"detail window\"\n\
\032 at the bottom of the screen, when unison is configured to\n\
\032 synchronize them.\n\
@@ -3967,11 +3936,11 @@
\032 information that should be useful for identifying sources of\n\
\032 problems.\n\
\032 + The version number of the remote server is now checked right\n\
- \032 away during the connection setup handshake, rather than\n\
- \032 later. (Somebody sent a bug report of a server crash that\n\
- \032 turned out to come from using inconsistent versions: better\n\
- \032 to check this earlier and in a way that can't crash either\n\
- \032 client or server.)\n\
+ \032 away during the connection setup handshake, rather than later.\n\
+ \032 (Somebody sent a bug report of a server crash that turned out\n\
+ \032 to come from using inconsistent versions: better to check this\n\
+ \032 earlier and in a way that can't crash either client or\n\
+ \032 server.)\n\
\032 + Unison now runs correctly on 64-bit architectures (e.g. Alpha\n\
\032 linux). We will not be distributing binaries for these\n\
\032 architectures ourselves (at least for a while) but if someone\n\
@@ -3979,8 +3948,8 @@
\032 link to them.\n\
\032 * Bug fixes:\n\
\032 + Pattern matching (e.g. for ignore) is now case-insensitive\n\
- \032 when Unison is in case-insensitive mode (i.e., when one of\n\
- \032 the replicas is on a windows machine).\n\
+ \032 when Unison is in case-insensitive mode (i.e., when one of the\n\
+ \032 replicas is on a windows machine).\n\
\032 + Some people had trouble with mysterious failures during\n\
\032 propagation of updates, where files would be falsely reported\n\
\032 as having changed during synchronization. This should be\n\
@@ -3989,9 +3958,9 @@
\n\
\032 Changes since 2.4.1:\n\
\032 * Added a number of 'sorting modes' for the user interface. By\n\
- \032 default, conflicting changes are displayed at the top, and the\n\
- \032 rest of the entries are sorted in alphabetical order. This\n\
- \032 behavior can be changed in the following ways:\n\
+ \032 default, conflicting changes are displayed at the top, and the rest\n\
+ \032 of the entries are sorted in alphabetical order. This behavior can\n\
+ \032 be changed in the following ways:\n\
\032 + Setting the sortnewfirst preference to true causes newly\n\
\032 created files to be displayed before changed files.\n\
\032 + Setting sortbysize causes files to be displayed in increasing\n\
@@ -4022,15 +3991,15 @@
\032 * Small changes:\n\
\032 + Changed default answer to 'Yes' in all two-button dialogs in\n\
\032 the graphical interface (this seems more intuitive).\n\
- \032 + The rsync preference has been removed (it was used to\n\
- \032 activate rsync compression for file transfers, but rsync\n\
- \032 compression is now enabled by default).\n\
+ \032 + The rsync preference has been removed (it was used to activate\n\
+ \032 rsync compression for file transfers, but rsync compression is\n\
+ \032 now enabled by default).\n\
\032 + In the text user interface, the arrows indicating which\n\
- \032 direction changes are being propagated are printed\n\
- \032 differently when the user has overridded Unison's default\n\
- \032 recommendation (====> instead of ---->). This matches the\n\
- \032 behavior of the graphical interface, which displays such\n\
- \032 arrows in a different color.\n\
+ \032 direction changes are being propagated are printed differently\n\
+ \032 when the user has overridded Unison's default recommendation\n\
+ \032 (====> instead of ---->). This matches the behavior of the\n\
+ \032 graphical interface, which displays such arrows in a different\n\
+ \032 color.\n\
\032 + Carriage returns (Control-M's) are ignored at the ends of\n\
\032 lines in profiles, for Windows compatibility.\n\
\032 + All preferences are now fully documented in the user manual.\n\
@@ -4041,8 +4010,8 @@
\032 conflicts. The first sync after upgrading will be slow.\n\
\032 * New/improved functionality:\n\
\032 + A new preference -sortbysize controls the order in which\n\
- \032 changes are displayed to the user: when it is set to true,\n\
- \032 the smallest changed files are displayed first. (The default\n\
+ \032 changes are displayed to the user: when it is set to true, the\n\
+ \032 smallest changed files are displayed first. (The default\n\
\032 setting is false.)\n\
\032 + A new preference -sortnewfirst causes newly created files to\n\
\032 be listed before other updates in the user interface.\n\
@@ -4053,16 +4022,16 @@
\032 without an explicit protocol, we now assume it refers to a\n\
\032 file. (Previously \"//saul/foo\" meant to use SSH to connect to\n\
\032 saul, then access the foo directory. Now it means to access\n\
- \032 saul via a remote file mechanism such as samba; the old\n\
- \032 effect is now achieved by writing ssh://saul/foo.)\n\
+ \032 saul via a remote file mechanism such as samba; the old effect\n\
+ \032 is now achieved by writing ssh://saul/foo.)\n\
\032 + Changed the startup sequence for the case where roots are\n\
\032 given but no profile is given on the command line. The new\n\
- \032 behavior is to use the default profile (creating it if it\n\
- \032 does not exist), and temporarily override its roots. The\n\
- \032 manual claimed that this case would work by reading no\n\
- \032 profile at all, but AFAIK this was never true.\n\
- \032 + In all user interfaces, files with conflicts are always\n\
- \032 listed first\n\
+ \032 behavior is to use the default profile (creating it if it does\n\
+ \032 not exist), and temporarily override its roots. The manual\n\
+ \032 claimed that this case would work by reading no profile at\n\
+ \032 all, but AFAIK this was never true.\n\
+ \032 + In all user interfaces, files with conflicts are always listed\n\
+ \032 first\n\
\032 + A new preference 'sshversion' can be used to control which\n\
\032 version of ssh should be used to connect to the server. Legal\n\
\032 values are 1 and 2. (Default is empty, which will make unison\n\
@@ -4073,32 +4042,31 @@
\032 a spurious conflict)\n\
\032 * Improvements for the Windows version:\n\
\032 + The fact that filenames are treated case-insensitively under\n\
- \032 Windows should now be handled correctly. The exact behavior\n\
- \032 is described in the cross-platform section of the manual.\n\
+ \032 Windows should now be handled correctly. The exact behavior is\n\
+ \032 described in the cross-platform section of the manual.\n\
\032 + It should be possible to synchronize with Windows shares,\n\
\032 e.g., //host/drive/path.\n\
- \032 + Workarounds to the bug in syncing root directories in\n\
- \032 Windows. The most difficult thing to fix is an ocaml bug:\n\
- \032 Unix.opendir fails on c: in some versions of Windows.\n\
+ \032 + Workarounds to the bug in syncing root directories in Windows.\n\
+ \032 The most difficult thing to fix is an ocaml bug: Unix.opendir\n\
+ \032 fails on c: in some versions of Windows.\n\
\032 * Improvements to the GTK user interface (the Tk interface is no\n\
\032 longer being maintained):\n\
\032 + The UI now displays actions differently (in blue) when they\n\
- \032 have been explicitly changed by the user from Unison's\n\
- \032 default recommendation.\n\
+ \032 have been explicitly changed by the user from Unison's default\n\
+ \032 recommendation.\n\
\032 + More colorful appearance.\n\
\032 + The initial profile selection window works better.\n\
- \032 + If any transfers failed, a message to this effect is\n\
- \032 displayed along with 'Synchronization complete' at the end of\n\
- \032 the transfer phase (in case they may have scrolled off the\n\
- \032 top).\n\
+ \032 + If any transfers failed, a message to this effect is displayed\n\
+ \032 along with 'Synchronization complete' at the end of the\n\
+ \032 transfer phase (in case they may have scrolled off the top).\n\
\032 + Added a global progress meter, displaying the percentage of\n\
\032 total bytes that have been transferred so far.\n\
\032 * Improvements to the text user interface:\n\
\032 + The file details will be displayed automatically when a\n\
\032 conflict is been detected.\n\
\032 + when a warning is generated (e.g. for a temporary file left\n\
- \032 over from a previous run of unison) Unison will no longer\n\
- \032 wait for a response if it is running in -batch mode.\n\
+ \032 over from a previous run of unison) Unison will no longer wait\n\
+ \032 for a response if it is running in -batch mode.\n\
\032 + The UI now displays a short list of possible inputs each time\n\
\032 it waits for user interaction.\n\
\032 + The UI now quits immediately (rather than looping back and\n\
@@ -4111,11 +4079,10 @@
\032 + The manual now includes a FAQ, plus sections on common\n\
\032 problems and on tricks contributed by users.\n\
\032 + Both the download page and the download directory explicitly\n\
- \032 say what are the current stable and beta-test version\n\
- \032 numbers.\n\
- \032 + The OCaml sources for the up-to-the-minute developers'\n\
- \032 version (not guaranteed to be stable, or even to compile, at\n\
- \032 any given time!) are now available from the download page.\n\
+ \032 say what are the current stable and beta-test version numbers.\n\
+ \032 + The OCaml sources for the up-to-the-minute developers' version\n\
+ \032 (not guaranteed to be stable, or even to compile, at any given\n\
+ \032 time!) are now available from the download page.\n\
\032 + Added a subsection to the manual describing cross-platform\n\
\032 issues (case conflicts, illegal filenames)\n\
\032 * Many small bug fixes and random improvements.\n\
@@ -4126,22 +4093,22 @@
\032 'rename' error.\n\
\n\
\032 Changes since 2.2:\n\
- \032 * The multi-threaded transport system is now disabled by default.\n\
- \032 (It is not stable enough yet.)\n\
+ \032 * The multi-threaded transport system is now disabled by default. (It\n\
+ \032 is not stable enough yet.)\n\
\032 * Various bug fixes.\n\
\032 * A new experimental feature:\n\
\032 The final component of a -path argument may now be the wildcard\n\
\032 specifier *. When Unison sees such a path, it expands this path on\n\
- \032 the client into into the corresponding list of paths by listing\n\
- \032 the contents of that directory.\n\
- \032 Note that if you use wildcard paths from the command line, you\n\
- \032 will probably need to use quotes or a backslash to prevent the *\n\
- \032 from being interpreted by your shell.\n\
- \032 If both roots are local, the contents of the first one will be\n\
- \032 used for expanding wildcard paths. (Nb: this is the first one\n\
- \032 after the canonization step - i.e., the one that is listed first\n\
- \032 in the user interface - not the one listed first on the command\n\
- \032 line or in the preferences file.)\n\
+ \032 the client into into the corresponding list of paths by listing the\n\
+ \032 contents of that directory.\n\
+ \032 Note that if you use wildcard paths from the command line, you will\n\
+ \032 probably need to use quotes or a backslash to prevent the * from\n\
+ \032 being interpreted by your shell.\n\
+ \032 If both roots are local, the contents of the first one will be used\n\
+ \032 for expanding wildcard paths. (Nb: this is the first one after the\n\
+ \032 canonization step - i.e., the one that is listed first in the user\n\
+ \032 interface - not the one listed first on the command line or in the\n\
+ \032 preferences file.)\n\
\n\
\032 Changes since 2.1:\n\
\032 * The transport subsystem now includes an implementation by Sylvain\n\
@@ -4149,15 +4116,15 @@
\032 protocol. This protocol achieves much faster transfers when only a\n\
\032 small part of a large file has been changed by sending just diffs.\n\
\032 This feature is mainly helpful for transfers over slow links--on\n\
- \032 fast local area networks it can actually degrade performance--so\n\
- \032 we have left it off by default. Start unison with the -rsync\n\
- \032 option (or put rsync=true in your preferences file) to turn it on.\n\
+ \032 fast local area networks it can actually degrade performance--so we\n\
+ \032 have left it off by default. Start unison with the -rsync option\n\
+ \032 (or put rsync=true in your preferences file) to turn it on.\n\
\032 * \"Progress bars\" are now diplayed during remote file transfers,\n\
\032 showing what percentage of each file has been transferred so far.\n\
\032 * The version numbering scheme has changed. New releases will now be\n\
- \032 have numbers like 2.2.30, where the second component is\n\
- \032 incremented on every significant public release and the third\n\
- \032 component is the \"patch level.\"\n\
+ \032 have numbers like 2.2.30, where the second component is incremented\n\
+ \032 on every significant public release and the third component is the\n\
+ \032 \"patch level.\"\n\
\032 * Miscellaneous improvements to the GTK-based user interface.\n\
\032 * The manual is now available in PDF format.\n\
\032 * We are experimenting with using a multi-threaded transport\n\
@@ -4165,14 +4132,13 @@
\032 more effective use of available network bandwidth. This feature is\n\
\032 not completely stable yet, so by default it is disabled in the\n\
\032 release version of Unison.\n\
- \032 If you want to play with the multi-threaded version, you'll need\n\
- \032 to recompile Unison from sources (as described in the\n\
- \032 documentation), setting the THREADS flag in Makefile.OCaml to\n\
- \032 true. Make sure that your OCaml compiler has been installed with\n\
- \032 the -with-pthreads configuration option. (You can verify this by\n\
- \032 checking whether the file threads/threads.cma in the OCaml\n\
- \032 standard library directory contains the string -lpthread near the\n\
- \032 end.)\n\
+ \032 If you want to play with the multi-threaded version, you'll need to\n\
+ \032 recompile Unison from sources (as described in the documentation),\n\
+ \032 setting the THREADS flag in Makefile.OCaml to true. Make sure that\n\
+ \032 your OCaml compiler has been installed with the -with-pthreads\n\
+ \032 configuration option. (You can verify this by checking whether the\n\
+ \032 file threads/threads.cma in the OCaml standard library directory\n\
+ \032 contains the string -lpthread near the end.)\n\
\n\
\032 Changes since 1.292:\n\
\032 * Reduced memory footprint (this is especially important during the\n\
@@ -4184,32 +4150,32 @@
\032 interface (to avoid hitting them accidentally).\n\
\n\
\032 Changes since 1.231:\n\
- \032 * Tunneling over ssh is now supported in the Windows version. See\n\
- \032 the installation section of the manual for detailed instructions.\n\
- \032 * The transport subsystem now includes an implementation of the\n\
- \032 rsync protocol, built by Sylvain Gommier and Norman Ramsey. This\n\
- \032 protocol achieves much faster transfers when only a small part of\n\
- \032 a large file has been changed by sending just diffs. The rsync\n\
- \032 feature is off by default in the current version. Use the -rsync\n\
- \032 switch to turn it on. (Nb. We still have a lot of tuning to do:\n\
- \032 you may not notice much speedup yet.)\n\
+ \032 * Tunneling over ssh is now supported in the Windows version. See the\n\
+ \032 installation section of the manual for detailed instructions.\n\
+ \032 * The transport subsystem now includes an implementation of the rsync\n\
+ \032 protocol, built by Sylvain Gommier and Norman Ramsey. This protocol\n\
+ \032 achieves much faster transfers when only a small part of a large\n\
+ \032 file has been changed by sending just diffs. The rsync feature is\n\
+ \032 off by default in the current version. Use the -rsync switch to\n\
+ \032 turn it on. (Nb. We still have a lot of tuning to do: you may not\n\
+ \032 notice much speedup yet.)\n\
\032 * We're experimenting with a multi-threaded transport subsystem,\n\
\032 written by Jerome Vouillon. The downloadable binaries are still\n\
\032 single-threaded: if you want to try the multi-threaded version,\n\
\032 you'll need to recompile from sources. (Say make THREADS=true.)\n\
- \032 Native thread support from the compiler is required. Use the\n\
- \032 option -threads N to select the maximal number of concurrent\n\
- \032 threads (default is 5). Multi-threaded and single-threaded\n\
- \032 clients/servers can interoperate.\n\
+ \032 Native thread support from the compiler is required. Use the option\n\
+ \032 -threads N to select the maximal number of concurrent threads\n\
+ \032 (default is 5). Multi-threaded and single-threaded clients/servers\n\
+ \032 can interoperate.\n\
\032 * A new GTK-based user interface is now available, thanks to Jacques\n\
\032 Garrigue. The Tk user interface still works, but we'll be shifting\n\
\032 development effort to the GTK interface from now on.\n\
\032 * OCaml 3.00 is now required for compiling Unison from sources. The\n\
\032 modules uitk and myfileselect have been changed to use labltk\n\
- \032 instead of camltk. To compile the Tk interface in Windows, you\n\
- \032 must have ocaml-3.00 and tk8.3. When installing tk8.3, put it in\n\
- \032 c:\\Tcl rather than the suggested c:\\Program Files\\Tcl, and be sure\n\
- \032 to install the headers and libraries (which are not installed by\n\
+ \032 instead of camltk. To compile the Tk interface in Windows, you must\n\
+ \032 have ocaml-3.00 and tk8.3. When installing tk8.3, put it in c:\\Tcl\n\
+ \032 rather than the suggested c:\\Program Files\\Tcl, and be sure to\n\
+ \032 install the headers and libraries (which are not installed by\n\
\032 default).\n\
\032 * Added a new -addversionno switch, which causes unison to use\n\
\032 unison-<currentversionnumber> instead of just unison as the remote\n\
@@ -4225,8 +4191,8 @@
\032 + Some cases where propagation of file permissions was not\n\
\032 working.\n\
\032 + umask is now ignored when creating directories\n\
- \032 + directories are create writable, so that a read-only\n\
- \032 directory and its contents can be propagated.\n\
+ \032 + directories are create writable, so that a read-only directory\n\
+ \032 and its contents can be propagated.\n\
\032 + Handling of warnings generated by the server.\n\
\032 + Synchronizing a path whose parent is not a directory on both\n\
\032 sides is now flagged as erroneous.\n\
@@ -4283,8 +4249,7 @@
\032 causing spurious reports of different permissions when\n\
\032 synchronizing between windows and unix systems.\n\
\032 * Fixed one more non-tail-recursive list processing function, which\n\
- \032 was causing stack overflows when synchronizing very large\n\
- \032 replicas.\n\
+ \032 was causing stack overflows when synchronizing very large replicas.\n\
\n\
\032 Changes since 1.169:\n\
\032 * The text user interface now provides commands for ignoring files.\n\
@@ -4292,17 +4257,21 @@
\032 functions. Some power users have reported success with very large\n\
\032 replicas.\n\
\032 * INCOMPATIBLE CHANGE: Files ending in .tmp are no longer ignored\n\
- \032 automatically. If you want to ignore such files, put an\n\
- \032 appropriate ignore pattern in your profile.\n\
+ \032 automatically. If you want to ignore such files, put an appropriate\n\
+ \032 ignore pattern in your profile.\n\
\032 * INCOMPATIBLE CHANGE: The syntax of ignore and follow patterns has\n\
\032 changed. Instead of putting a line of the form\n\
\032 ignore = <regexp>\n\
+ \n\
\032 in your profile (.unison/default.prf), you should put:\n\
\032 ignore = Regex <regexp>\n\
+ \n\
\032 Moreover, two other styles of pattern are also recognized:\n\
\032 ignore = Name <name>\n\
+ \n\
\032 matches any path in which one component matches <name>, while\n\
\032 ignore = Path <path>\n\
+ \n\
\032 matches exactly the path <path>.\n\
\032 Standard \"globbing\" conventions can be used in <name> and <path>:\n\
\032 + a ? matches any single character except /\n\
@@ -4352,6 +4321,7 @@
\032 * You can now have different preference files in your .unison\n\
\032 directory. If you start unison like this\n\
\032 unison profilename\n\
+ \n\
\032 (i.e. with just one \"anonymous\" command-line argument), then the\n\
\032 file ~/.unison/profilename.prf will be loaded instead of\n\
\032 default.prf.\n\
@@ -4359,8 +4329,8 @@
\032 * Added a switch -killServer that terminates the remote server\n\
\032 process when the unison client is shutting down, even when using\n\
\032 sockets for communication. (By default, a remote server created\n\
- \032 using ssh/rsh is terminated automatically, while a socket server\n\
- \032 is left running.)\n\
+ \032 using ssh/rsh is terminated automatically, while a socket server is\n\
+ \032 left running.)\n\
\032 * When started in 'socket server' mode, unison prints 'server\n\
\032 started' on stderr when it is ready to accept connections. (This\n\
\032 may be useful for scripts that want to tell when a socket-mode\n\
@@ -4375,13 +4345,13 @@
::
("", ("Junk",
"Junk\n\
- \032 _________________________________________________________________\n\
+ \032 __________________________________________________________________\n\
\n\
\032 This document was translated from L^AT[E]X by [2]H^EV^EA.\n\
\n\
References\n\
\n\
- \032 1. file://localhost/Users/bcpierce/current/unison/branches/2.40/doc/temp.html#ssh-win\n\
+ \032 1. file:///Users/bcpierce/current/unison/branches/2.40/doc/temp.html#ssh-win\n\
\032 2. http://pauillac.inria.fr/~maranget/hevea/index.html\n\
"))
::
Modified: branches/2.40/src/ubase/Makefile
===================================================================
--- branches/2.40/src/ubase/Makefile 2014-12-29 18:34:45 UTC (rev 536)
+++ branches/2.40/src/ubase/Makefile 2014-12-30 02:21:28 UTC (rev 537)
@@ -1,7 +1,7 @@
NAME = ubase
OBJECTS = \
- safelist.cmo uprintf.cmo util.cmo uarg.cmo prefs.cmo trace.cmo rx.cmo \
+ safelist.cmo util.cmo uarg.cmo prefs.cmo trace.cmo rx.cmo \
myMap.cmo
OCAMLC = ocamlfind ocamlc -g
@@ -54,4 +54,4 @@
# Used by BCP to update Harmony's copy of these files from Unison's
update:
- cp $(HOME)/current/unison/trunk/src/ubase/{*.ml,*.mli,Makefile} .
\ No newline at end of file
+ cp $(HOME)/current/unison/trunk/src/ubase/{*.ml,*.mli,Makefile} .
Modified: branches/2.40/src/ubase/depend
===================================================================
--- branches/2.40/src/ubase/depend 2014-12-29 18:34:45 UTC (rev 536)
+++ branches/2.40/src/ubase/depend 2014-12-30 02:21:28 UTC (rev 537)
@@ -1,27 +1,24 @@
-myMap.cmo: myMap.cmi
-myMap.cmx: myMap.cmi
-prefs.cmo: util.cmi uarg.cmi safelist.cmi prefs.cmi
-prefs.cmx: util.cmx uarg.cmx safelist.cmx prefs.cmi
-proplist.cmo: util.cmi proplist.cmi
-proplist.cmx: util.cmx proplist.cmi
-rx.cmo: rx.cmi
-rx.cmx: rx.cmi
-safelist.cmo: safelist.cmi
-safelist.cmx: safelist.cmi
-trace.cmo: util.cmi safelist.cmi prefs.cmi trace.cmi
-trace.cmx: util.cmx safelist.cmx prefs.cmx trace.cmi
-uarg.cmo: util.cmi safelist.cmi uarg.cmi
-uarg.cmx: util.cmx safelist.cmx uarg.cmi
-uprintf.cmo: uprintf.cmi
-uprintf.cmx: uprintf.cmi
-util.cmo: uprintf.cmi safelist.cmi util.cmi
-util.cmx: uprintf.cmx safelist.cmx util.cmi
-myMap.cmi:
-prefs.cmi: util.cmi
-proplist.cmi:
-rx.cmi:
-safelist.cmi:
-trace.cmi: prefs.cmi
-uarg.cmi:
-uprintf.cmi:
-util.cmi:
+myMap.cmo : myMap.cmi
+myMap.cmx : myMap.cmi
+prefs.cmo : util.cmi uarg.cmi safelist.cmi prefs.cmi
+prefs.cmx : util.cmx uarg.cmx safelist.cmx prefs.cmi
+proplist.cmo : util.cmi proplist.cmi
+proplist.cmx : util.cmx proplist.cmi
+rx.cmo : rx.cmi
+rx.cmx : rx.cmi
+safelist.cmo : safelist.cmi
+safelist.cmx : safelist.cmi
+trace.cmo : util.cmi safelist.cmi prefs.cmi trace.cmi
+trace.cmx : util.cmx safelist.cmx prefs.cmx trace.cmi
+uarg.cmo : util.cmi safelist.cmi uarg.cmi
+uarg.cmx : util.cmx safelist.cmx uarg.cmi
+util.cmo : safelist.cmi util.cmi
+util.cmx : safelist.cmx util.cmi
+myMap.cmi :
+prefs.cmi : util.cmi
+proplist.cmi :
+rx.cmi :
+safelist.cmi :
+trace.cmi : prefs.cmi
+uarg.cmi :
+util.cmi :
Deleted: branches/2.40/src/ubase/uprintf.ml
===================================================================
--- branches/2.40/src/ubase/uprintf.ml 2014-12-29 18:34:45 UTC (rev 536)
+++ branches/2.40/src/ubase/uprintf.ml 2014-12-30 02:21:28 UTC (rev 537)
@@ -1,94 +0,0 @@
-(***********************************************************************)
-(* *)
-(* Objective Caml *)
-(* *)
-(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
-(* *)
-(* Copyright 1996 Institut National de Recherche en Informatique et *)
-(* en Automatique. All rights reserved. This file is distributed *)
-(* under the terms of the GNU Library General Public License. *)
-(* *)
-(***********************************************************************)
-
-external caml_format_int: string -> int -> string = "caml_format_int"
-external caml_format_float: string -> float -> string = "caml_format_float"
-
-let fprintf outchan doafter format =
- let format = (Obj.magic format : string) in
- let rec doprn i =
- if i >= String.length format then
- (doafter(); Obj.magic ())
- else begin
- let c = String.unsafe_get format i in
- if c <> '%' then begin
- output_char outchan c;
- doprn (succ i)
- end else begin
- let j = skip_args (succ i) in
- match String.unsafe_get format j with
- '%' ->
- output_char outchan '%';
- doprn (succ j)
- | 's' ->
- Obj.magic(fun s ->
- if j <= i+1 then
- output_string outchan s
- else begin
- let p =
- try
- int_of_string (String.sub format (i+1) (j-i-1))
- with Failure _ ->
- invalid_arg "fprintf: bad %s format" in
- if p > 0 && String.length s < p then begin
- output_string outchan
- (String.make (p - String.length s) ' ');
- output_string outchan s
- end else if p < 0 && String.length s < -p then begin
- output_string outchan s;
- output_string outchan
- (String.make (-p - String.length s) ' ')
- end else
- output_string outchan s
- end;
- doprn (succ j))
- | 'c' ->
- Obj.magic(fun c ->
- output_char outchan c;
- doprn (succ j))
- | 'd' | 'i' | 'o' | 'x' | 'X' | 'u' ->
- Obj.magic(fun n ->
- output_string outchan
- (caml_format_int (String.sub format i (j-i+1)) n);
- doprn (succ j))
- | 'f' | 'e' | 'E' | 'g' | 'G' ->
- Obj.magic(fun f ->
- output_string outchan
- (caml_format_float (String.sub format i (j-i+1)) f);
- doprn (succ j))
- | 'b' ->
- Obj.magic(fun b ->
- output_string outchan (string_of_bool b);
- doprn (succ j))
- | 'a' ->
- Obj.magic(fun printer arg ->
- printer outchan arg;
- doprn(succ j))
- | 't' ->
- Obj.magic(fun printer ->
- printer outchan;
- doprn(succ j))
- | c ->
- invalid_arg ("fprintf: unknown format")
- end
- end
-
- and skip_args j =
- match String.unsafe_get format j with
- '0' .. '9' | ' ' | '.' | '-' -> skip_args (succ j)
- | c -> j
-
- in doprn 0
-
-let printf doafter fmt = fprintf stdout doafter fmt
-and eprintf doafter fmt = fprintf stderr doafter fmt
-
Deleted: branches/2.40/src/ubase/uprintf.mli
===================================================================
--- branches/2.40/src/ubase/uprintf.mli 2014-12-29 18:34:45 UTC (rev 536)
+++ branches/2.40/src/ubase/uprintf.mli 2014-12-30 02:21:28 UTC (rev 537)
@@ -1,75 +0,0 @@
-(***********************************************************************)
-(* *)
-(* Objective Caml *)
-(* *)
-(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
-(* *)
-(* Copyright 1996 Institut National de Recherche en Informatique et *)
-(* en Automatique. All rights reserved. This file is distributed *)
-(* under the terms of the GNU Library General Public License. *)
-(* *)
-(***********************************************************************)
-
-(* Modified for Unison *)
-
-
-(* Module [Printf]: formatting printing functions *)
-
-val fprintf: out_channel -> (unit->unit) -> ('a, out_channel, unit) format -> 'a
- (* [fprintf outchan doafter format arg1 ... argN] formats the arguments
- [arg1] to [argN] according to the format string [format],
- outputs the resulting string on the channel [outchan], and then
- executes the thunk [doafter].
-
- The format is a character string which contains two types of
- objects: plain characters, which are simply copied to the
- output channel, and conversion specifications, each of which
- causes conversion and printing of one argument.
-
- Conversion specifications consist in the [%] character, followed
- by optional flags and field widths, followed by one conversion
- character. The conversion characters and their meanings are:
-- [d] or [i]: convert an integer argument to signed decimal
-- [u]: convert an integer argument to unsigned decimal
-- [x]: convert an integer argument to unsigned hexadecimal,
- using lowercase letters.
-- [X]: convert an integer argument to unsigned hexadecimal,
- using uppercase letters.
-- [o]: convert an integer argument to unsigned octal.
-- [s]: insert a string argument
-- [c]: insert a character argument
-- [f]: convert a floating-point argument to decimal notation,
- in the style [dddd.ddd]
-- [e] or [E]: convert a floating-point argument to decimal notation,
- in the style [d.ddd e+-dd] (mantissa and exponent)
-- [g] or [G]: convert a floating-point argument to decimal notation,
- in style [f] or [e], [E] (whichever is more compact)
-- [b]: convert a boolean argument to the string [true] or [false]
-- [a]: user-defined printer. Takes two arguments and apply the first
- one to [outchan] (the current output channel) and to the second
- argument. The first argument must therefore have type
- [out_channel -> 'b -> unit] and the second ['b].
- The output produced by the function is therefore inserted
- in the output of [fprintf] at the current point.
-- [t]: same as [%a], but takes only one argument (with type
- [out_channel -> unit]) and apply it to [outchan].
-- [%]: take no argument and output one [%] character.
-- Refer to the C library [printf] function for the meaning of
- flags and field width specifiers.
-
- Warning: if too few arguments are provided,
- for instance because the [printf] function is partially
- applied, the format is immediately printed up to
- the conversion of the first missing argument; printing
- will then resume when the missing arguments are provided.
- For example, [List.iter (printf "x=%d y=%d " 1) [2;3]]
- prints [x=1 y=2 3] instead of the expected
- [x=1 y=2 x=1 y=3]. To get the expected behavior, do
- [List.iter (fun y -> printf "x=%d y=%d " 1 y) [2;3]]. *)
-
-val printf: (unit->unit) -> ('a, out_channel, unit) format -> 'a
- (* Same as [fprintf], but output on [stdout]. *)
-
-val eprintf: (unit->unit) -> ('a, out_channel, unit) format -> 'a
- (* Same as [fprintf], but output on [stderr]. *)
-
Modified: branches/2.40/src/ubase/util.ml
===================================================================
--- branches/2.40/src/ubase/util.ml 2014-12-29 18:34:45 UTC (rev 536)
+++ branches/2.40/src/ubase/util.ml 2014-12-30 02:21:28 UTC (rev 537)
@@ -62,7 +62,7 @@
if s <> !infos then begin clear_infos (); infos := s; show_infos () end
let msg f =
- clear_infos (); Uprintf.eprintf (fun () -> flush stderr; show_infos ()) f
+ clear_infos (); Printf.kfprintf (fun c -> flush c; show_infos ()) stderr f
let msg : ('a, out_channel, unit) format -> 'a = msg
More information about the Unison-hackers
mailing list