lp:~jelmer/brz/conflicts

Created by Jelmer Vernooij and last modified
Get this branch:
bzr branch lp:~jelmer/brz/conflicts
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

Owner:
Jelmer Vernooij
Project:
Breezy
Status:
Merged

Recent revisions

6896. By Jelmer Vernooij

Actually pass in None file-ids to BranchBuilder.

These changes were lost during some of the many merge conflicts.

6895. By Jelmer Vernooij

Fix test failure.

6894. By Jelmer Vernooij

merge trunk

6893. By Jelmer Vernooij

Merge trunk.

6892. By Jelmer Vernooij

Merge trunk.

6891. By Jelmer Vernooij

Merge trunk.

6890. By Jelmer Vernooij

merge trunk.

6889. By Jelmer Vernooij

Fix some more tests.

6888. By Jelmer Vernooij

Fix more tests.

6887. By Jelmer Vernooij

Fix some conflict tests.

Branch metadata

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

Subscribers