Rev 6410: Add some doc. in file:///home/vila/src/bzr/experimental/single-read-write/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/single-read-write/

------------------------------------------------------------
revno: 6410
revision-id: v.ladeuil+lp at free.fr-20120102083700-aloy38w67hwwyyp3
parent: v.ladeuil+lp at free.fr-20111230152431-5sunnmvtsw3xkdie
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: single-read-write
timestamp: Mon 2012-01-02 09:37:00 +0100
message:
  Add some doc.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-12-30 15:24:31 +0000
+++ b/bzrlib/config.py	2012-01-02 08:37:00 +0000
@@ -2921,6 +2921,10 @@
                     self.remove(k)
             else:
                 self.set(k, actual)
+            # Report concurrent updates in an ad-hoc way. This should only
+            # occurs when different processes try to update the same option
+            # which is not supported (as in: the config framework is not meant
+            # to be used a sharing mechanism).
             if expected != reloaded:
                 if actual is _DeletedOption:
                     actual = '<DELETED>'

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-12-22 18:52:58 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2012-01-02 08:37:00 +0000
@@ -131,6 +131,11 @@
 * Configuration options can be SI units by using ``int_SI_from_unicode`` as
   their ``convert_from_unicode`` helper. (Vincent Ladeuil)
 
+* Configuration stores can now save incremental changes by using
+  ``save_changes()`` instead of ``save()``. This reduces the number or
+  required input/outputs and allows stores to be shared between
+  stacks. (Vincent Ladeuil)
+
 * ControlDir now has a get_branches method that returns a dictionary
   whose keys are the names of the branches and whose values are the
   branches themselves. The active branch uses the key None.