Merge lp://staging/~jelmer/brz/inventory-2 into lp://staging/brz
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij |
Approved revision: | 7814 |
Merged at revision: | 7814 |
Proposed branch: | lp://staging/~jelmer/brz/inventory-2 |
Merge into: | lp://staging/brz |
Diff against target: |
721 lines (+153/-164) 13 files modified
breezy/bzr/inventory.py (+87/-105) breezy/bzr/inventorytree.py (+1/-1) breezy/bzr/tests/per_inventory/basics.py (+1/-1) breezy/bzr/tests/per_repository_vf/test_repository.py (+3/-3) breezy/bzr/tests/test_dirstate.py (+3/-5) breezy/bzr/tests/test_inv.py (+9/-13) breezy/bzr/workingtree.py (+20/-17) breezy/bzr/workingtree_4.py (+1/-1) breezy/bzr/xml5.py (+6/-2) breezy/merge.py (+8/-5) breezy/plugins/fastimport/bzr_commit_handler.py (+2/-7) breezy/tests/test_extract.py (+4/-1) crates/bazaar-py/src/inventory.rs (+8/-3) |
To merge this branch: | bzr merge lp://staging/~jelmer/brz/inventory-2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij | Approve | ||
Review via email: mp+442801@code.staging.launchpad.net |
Commit message
Don't store children in InventoryDirectory
Description of the change
Don't store children in InventoryDirectory
To post a comment you must log in.