/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: Jelmer Vernooij
  • Date: 2019-06-22 11:51:56 UTC
  • mfrom: (7356 work)
  • mto: This revision was merged to the branch mainline in revision 7358.
  • Revision ID: jelmer@jelmer.uk-20190622115156-20uwy6b97g94bbv1
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge.py
477
477
            this_tree, b'rev2b', other_branch=other_tree.branch)
478
478
        merger.merge_type = _mod_merge.Merge3Merger
479
479
        tree_merger = merger.make_merger()
480
 
        tt = tree_merger.make_preview_transform()
481
 
        self.addCleanup(tt.finalize)
482
 
        preview_tree = tt.get_preview_tree()
483
 
        with this_tree.get_file('file') as tree_file:
484
 
            self.assertEqual(b'1\n2a\n', tree_file.read())
485
 
        with preview_tree.get_file('file') as preview_file:
486
 
            self.assertEqual(b'2b\n1\n2a\n', preview_file.read())
 
480
        with tree_merger.make_preview_transform() as tt:
 
481
            preview_tree = tt.get_preview_tree()
 
482
            with this_tree.get_file('file') as tree_file:
 
483
                self.assertEqual(b'1\n2a\n', tree_file.read())
 
484
            with preview_tree.get_file('file') as preview_file:
 
485
                self.assertEqual(b'2b\n1\n2a\n', preview_file.read())
487
486
 
488
487
    def test_do_merge(self):
489
488
        this_tree = self.make_branch_and_tree('this')
2261
2260
        builder.build_snapshot([b'C-id', b'B-id'], [], revision_id=b'E-id')
2262
2261
        # Have to use a real WT, because BranchBuilder doesn't support exec bit
2263
2262
        wt = self.get_wt_from_builder(builder)
2264
 
        tt = transform.TreeTransform(wt)
2265
 
        try:
 
2263
        with wt.get_transform() as tt:
2266
2264
            tt.set_executability(True, tt.trans_id_tree_path('foo'))
2267
2265
            tt.apply()
2268
 
        except:
2269
 
            tt.finalize()
2270
 
            raise
2271
2266
        self.assertTrue(wt.is_executable('foo'))
2272
2267
        wt.commit('F-id', rev_id=b'F-id')
2273
2268
        # Reset to D, so that we can merge F
3108
3103
 
3109
3104
    def test_uses_this_branch(self):
3110
3105
        builder = self.make_text_conflict()
3111
 
        tt = builder.make_preview_transform()
3112
 
        self.addCleanup(tt.finalize)
 
3106
        with builder.make_preview_transform() as tt:
 
3107
            pass
3113
3108
 
3114
3109
    def test_affected_files_cached(self):
3115
3110
        """Ensures that the config variable is cached"""