lp://staging/~jelmer/brz/lossy

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6934. By Jelmer Vernooij on 2018-05-05

merge trunk.

6933. By Jelmer Vernooij on 2018-05-05

Merge lp:brz.

6932. By Jelmer Vernooij on 2018-04-06

merge trunk

6931. By Jelmer Vernooij on 2018-03-31

Support --lossy argument to 'brz push'.

6930. By Jelmer Vernooij on 2018-03-31

add --lossy option to 'bzr push'.

6929. By Jelmer Vernooij on 2018-03-27

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 on 2018-03-25

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 on 2018-03-25

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 on 2018-03-25

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 on 2018-03-24

Fix regression dealing with LCA merges.

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