/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_bundle.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 18:44:23 UTC
  • mfrom: (6681 work)
  • mto: This revision was merged to the branch mainline in revision 6684.
  • Revision ID: jelmer@jelmer.uk-20170610184423-viizzbubmjxjq5p9
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
1156
1156
        self.tree1.add('file3', 'file3-id')
1157
1157
        self.tree1.commit('rev2')
1158
1158
        # Updating file2 should not cause an attempt to add to file1's vf
1159
 
        target = self.tree1.bzrdir.sprout('target').open_workingtree()
 
1159
        target = self.tree1.controldir.sprout('target').open_workingtree()
1160
1160
        self.build_tree_contents([('tree/file2', 'contents3')])
1161
1161
        self.tree1.commit('rev3', rev_id='rev3')
1162
1162
        bundle = self.get_valid_bundle('reva', 'rev3')
1638
1638
 
1639
1639
    def test_creating_bundle_preserves_chk_pages(self):
1640
1640
        self.make_merged_branch()
1641
 
        target = self.b1.bzrdir.sprout('target',
 
1641
        target = self.b1.controldir.sprout('target',
1642
1642
                                       revision_id='a@cset-0-2a').open_branch()
1643
1643
        bundle_txt, rev_ids = self.create_bundle_text('a@cset-0-2a',
1644
1644
                                                      'a@cset-0-3')