Rev 5809: Merge config-options into config-editor-option in file:///home/vila/src/bzr/experimental/config/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/config/

------------------------------------------------------------
revno: 5809 [merge]
revision-id: v.ladeuil+lp at free.fr-20110531082530-c7h5g3dl6tiieemi
parent: v.ladeuil+lp at free.fr-20110530145600-3ljchk6w41w5bftf
parent: v.ladeuil+lp at free.fr-20110531082529-c7hy36mw2ypu0mdt
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: config-editor-option
timestamp: Tue 2011-05-31 10:25:30 +0200
message:
  Merge config-options into config-editor-option
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-05-30 14:56:00 +0000
+++ b/bzrlib/config.py	2011-05-31 08:25:30 +0000
@@ -2436,9 +2436,9 @@
     @needs_write_lock
     def save(self):
         # We need to be able to override the undecorated implementation
-        self._save()
+        self.save_without_locking()
 
-    def _save(self):
+    def save_without_locking(self):
         super(BranchStore, self).save()