Fix the documentation of the reconciliation.

This commit is contained in:
Andreas Schneider 2009-05-25 12:58:00 +02:00
parent 62b33fbf2d
commit 778640f1e1

View file

@ -26,17 +26,14 @@
*
* @brief Reconciliation
*
* We merge replicas at the file level. The merged replica contains the
* superset of files that are on the local machine and server copies of
* the replica. In the case where the same file is in both the local
* and server copy, the file that was modified most recently is used.
* This means that new files are not deleted, and updated versions of
* existing files are not overwritten.
* The most important component is the update detector, because the reconciler
* depends on it. The correctness of reconciler is mandatory because it can
* damage a filesystem. It decides which file:
*
* When a file is updated, the merge algorithm compares the destination
* file with the the source file. If the destination file is newer
* (timestamp is newer), it is not overwritten. If both files, on the
* source and the destination, have been changed, the newer file wins.
* - stays untouched
* - has a conflict
* - gets synchronized
* - or is deleted.
*
* @defgroup csyncReconcilationInternals csync reconciliation internals
* @ingroup csyncInternalAPI