Rev 5806: Merge config-lock-remote into config-options in file:///home/vila/src/bzr/experimental/config/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5806 [merge]
revision-id: v.ladeuil+lp at free.fr-20110531082529-c7hy36mw2ypu0mdt
parent: v.ladeuil+lp at free.fr-20110530145559-k3h5cedvuztc8f3k
parent: v.ladeuil+lp at free.fr-20110531082528-72jeiuiied2rfv3t
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: config-options
timestamp: Tue 2011-05-31 10:25:29 +0200
message:
  Merge config-lock-remote into config-options
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-05-30 14:55:59 +0000
+++ b/bzrlib/config.py	2011-05-31 08:25:29 +0000
@@ -2430,9 +2430,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()