Merge lp:~vila/bzr/stack-remove-unknown into lp:bzr
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6561 |
Proposed branch: | lp:~vila/bzr/stack-remove-unknown |
Merge into: | lp:bzr |
Diff against target: |
11 lines (+1/-1) 1 file modified
bzrlib/config.py (+1/-1) |
To merge this branch: | bzr merge lp:~vila/bzr/stack-remove-unknown |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Packman (community) | Approve | ||
Review via email: mp+124622@code.launchpad.net |
Commit message
Fix obscure and misleading warning when trying to delete an unknown config option.
Description of the change
There is a bug in trunk:
$ ./bzr selftest -s bt.test_
running 5 tests...
bzr selftest: /home/vila/
/home/
bzr-2.6.0dev3 python-2.7.3 Linux-3.
test_config.
..._config.
test_config.
test_config.
test_config.
-------
Ran 5 tests in 0.130s
OK
Option I_do_not_exist in section . of file://
Option I_do_not_exist in section DEFAULT of file://
this has been introduced in revno 6554.
The fix is to not try to record an option deletion in a section if it
doesn't exist (because the deletion will failed, there is no deletion to
record). Why I missed that when submitting revno 6554 is a bit unclear, the
spurious warnings don't make the tests fail but are enough to demonstrate
both the bug and this proposed fix.
Seems fine. Does this want a separate test case, rather than just being seen in an absence of kipple on the existing tests?