[Zope-Checkins] SVN: Zope/branches/Zope-2_8-branch/doc/CHANGES.txt Note ConflictError logging changes.

[Chris Withers]

Log message for revision 40477:
  Note ConflictError logging changes.

Changed:
  U   Zope/branches/Zope-2_8-branch/doc/CHANGES.txt

-=-
Modified: Zope/branches/Zope-2_8-branch/doc/CHANGES.txt
===================================================================
--- Zope/branches/Zope-2_8-branch/doc/CHANGES.txt	2005-12-02 15:44:31 UTC (rev 40476)
+++ Zope/branches/Zope-2_8-branch/doc/CHANGES.txt	2005-12-02 15:46:29 UTC (rev 40477)
@@ -58,6 +58,13 @@
 
     Other
 
+      - Improved logging of ConflictErrors. All conflict errors are
+        logged at INFO, with counts of how many occurred and how many
+        were resolved. Tracebacks for all conflicts are logged a DEBUG
+        level, although these won't help anyone much. If a conflict
+        error is unresolved, it will now bubble up to error_log and
+        standard_error_message.
+
       - Suppressed output of deprecation warning in 'filepath' test
         for PythonScripts.