Rev 6555: Don't record an option deletion if there is no deletion to record. in file:///home/vila/src/bzr/bugs/stack-remove-unknown/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/stack-remove-unknown/

------------------------------------------------------------
revno: 6555
revision-id: v.ladeuil+lp at free.fr-20120917084519-tu3lwvj3wukyo728
parent: pqm at pqm.ubuntu.com-20120823142438-804xd3yql622ahhp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: stack-remove-unknown
timestamp: Mon 2012-09-17 10:45:19 +0200
message:
  Don't record an option deletion if there is no deletion to record.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2012-08-23 13:58:07 +0000
+++ b/bzrlib/config.py	2012-09-17 08:45:19 +0000
@@ -2944,7 +2944,7 @@
         self.options[name] = value
 
     def remove(self, name):
-        if name not in self.orig:
+        if name not in self.orig and name in self.options:
             self.orig[name] = self.get(name, None)
         del self.options[name]