Created by Jelmer Vernooij and last modified
Get this branch:
bzr branch lp://staging/~jelmer/brz/composite-tree
Only Jelmer Vernooij can upload to this branch. If you are Jelmer Vernooij please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Jelmer Vernooij

Recent revisions

6931. By Jelmer Vernooij

Merge tree-reference-fixes

6930. By Jelmer Vernooij

Merge composite tree branch.

6929. By Jelmer Vernooij

Change arguments for 'modify' and 'unversion' in BranchBuilder.build_snapshot from a file-id to path.

Merged from https://code.launchpad.net/~jelmer/brz/conflicts/+merge/341069

6928. By Jelmer Vernooij

Add more bees. In particular:

* for file ids
* for revision ids
* for file contents in build_tree_contents()

Merged from https://code.launchpad.net/~jelmer/brz/more-bees/+merge/337919

6927. By Jelmer Vernooij

Remove the __getitem__, __iter__ and __delitem__ implementations from Inventory.

Instead, add .get_entry(), .all_file_ids() and .delete().

Merged from https://code.launchpad.net/~jelmer/brz/inv-not-dict/+merge/342053

6926. By Jelmer Vernooij

Add more bees in places, get more tests to pass on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/bees/+merge/337908

6925. By Jelmer Vernooij

Fix regression dealing with LCA merges.

Merged from https://code.launchpad.net/~jelmer/brz/merge-lca-regression/+merge/342049

6924. By Jelmer Vernooij

Some foreign branch fixes for the commit builder tests.

Merged from https://code.launchpad.net/~jelmer/brz/commit-builder-fixes/+merge/342050

6923. By Jelmer Vernooij

Some random Python3 fixes.

In particular:
 * Make format strings bytestrings
 * Allow a $PYTHON variable to be set when calling testr

This adds another ~400 tests to the "known passing" list.

Merged from https://code.launchpad.net/~jelmer/brz/python3-more/+merge/337904

6922. By Jelmer Vernooij

Use HasPathRelations in a few more places.

Simplify the actual HasPathRelations implementation to always take tuples with
current and previous path. The mode in which only the current path is specified
is not useful; the HasLayout matcher can already be used for that.

Merged from https://code.launchpad.net/~jelmer/brz/has-path-relations/+merge/342034

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.