/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_merge.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-07-20 02:17:05 UTC
  • mfrom: (7518.1.2 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200720021705-5f11tmo1hdqjxm6x
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/387628

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge.py
145
145
        merger = _mod_merge.Merge3Merger(wt, wt, wt.basis_tree(), other_tree,
146
146
                                         this_branch=wt.branch,
147
147
                                         do_merge=False)
148
 
        with transform.TransformPreview(wt) as merger.tt:
 
148
        with wt.preview_transform() as merger.tt:
149
149
            merger._compute_transform()
150
150
            new_root_id = merger.tt.final_file_id(merger.tt.root)
151
151
            self.assertEqual(wt.path2id(''), new_root_id)
2259
2259
        builder.build_snapshot([b'C-id', b'B-id'], [], revision_id=b'E-id')
2260
2260
        # Have to use a real WT, because BranchBuilder doesn't support exec bit
2261
2261
        wt = self.get_wt_from_builder(builder)
2262
 
        with wt.get_transform() as tt:
 
2262
        with wt.transform() as tt:
2263
2263
            tt.set_executability(True, tt.trans_id_tree_path('foo'))
2264
2264
            tt.apply()
2265
2265
        self.assertTrue(wt.is_executable('foo'))