Merge lp:~jelmer/bzr/working-tree-config-stack into lp:bzr
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6454 |
Proposed branch: | lp:~jelmer/bzr/working-tree-config-stack |
Merge into: | lp:bzr |
Diff against target: |
101 lines (+21/-6) 5 files modified
bzrlib/tests/per_branch/test_branch.py (+1/-2) bzrlib/tests/per_workingtree/test_workingtree.py (+8/-2) bzrlib/workingtree.py (+8/-0) bzrlib/workingtree_4.py (+1/-2) doc/en/release-notes/bzr-2.5.txt (+3/-0) |
To merge this branch: | bzr merge lp:~jelmer/bzr/working-tree-config-stack |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil | Approve | ||
Review via email: mp+90525@code.launchpad.net |
Commit message
Add WorkingTree.
Description of the change
Add WorkingTree.
To post a comment you must log in.
29 + def test_get_ config( self):
test_get_ config_ stack.
64 + def get_config_ stack(self) : get_config_ stack()
65 + return self.branch.
Bah, of course ;) Comment to remind that it's only the branch conf that is
taken into account for now ?
Again, I'm surprised there are no more call sites that needs to migrate from
branch to tree config, but again, this can wait.