Commits

Oben Sonne committed fa9a43d

Comments (0)

Files changed (1)

 both repositories stay in sync (as long as they are no conflicting
 changes).
 
-Errors and merge conflicts which cannot be resolved automatically are highlighted in the output. Additionally an alerter tool can be specified to run on errors and conflicts ([[#Error_and_conflict_alerter|details below]]). The alerter is supposed to notify errors to a human. In any case the command keeps running and retries after the next interval, hoping things get fixed externally.
+Errors and merge conflicts which cannot be resolved automatically are highlighted in the output. Additionally an alerter tool can be specified to run on errors and conflicts. The alerter is supposed to notify errors to a human. In any case the command keeps running and retries after the next interval, hoping things get fixed externally.
     
 When running in daemon mode, any output gets logged into the file
 //autosync.log// within the repository's //.hg// directory (use //--daemon-log//
 
 ===== Error and conflict alerter =====
 
-On errors and conflicts the command keeps running and simply tries to synchronize again after the next interval. However, sometimes problems can only be fixed by a human. To notify problems, //autosync// may run an alerter program. To enable //autosync// to use an alerter, either //(1)// use the command option //--alerter//, //(2)// put an alerter program into the repository's root directory and name it //.hgalert// or //(3)// specify it in an HGRC file:
+To notify problems, //autosync// an alerter program can be enabled either //(1)// with the command option //--alerter//, //(2)// by putting an alerter program into the repository's root directory and name it //.hgalert// or //(3)// by specifying it in an HGRC file:
 {{{
 ...
 [autosync]
 ...
 }}}
 
-An alerter is searched in that order.
+When multiple options apply, the first one (in above order) is used.
 
 The repository path and an error message are passed as arguments to the alerter program.