/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

Merge python3-j.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge.py
245
245
        # tree
246
246
        tree2.commit('changed file text')
247
247
        tree.merge_from_branch(tree2.branch)
248
 
        self.assertFileEqual(b'text2', 'tree/sub-tree/file')
 
248
        self.assertFileEqual('text2', 'tree/sub-tree/file')
249
249
 
250
250
    def test_merge_with_missing(self):
251
251
        tree_a = self.make_branch_and_tree('tree_a')
377
377
            this_tree, 'rev3b', 'rev2b', other_tree.branch)
378
378
        merger.merge_type = _mod_merge.WeaveMerger
379
379
        merger.do_merge()
380
 
        self.assertFileEqual(b'c\na\n', 'this/file')
 
380
        self.assertFileEqual('c\na\n', 'this/file')
381
381
 
382
382
    def test_weave_cannot_reverse_cherrypick(self):
383
383
        this_tree, other_tree = self.prepare_cherrypick()
410
410
            this_tree, 'rev3b', 'rev2b', other_tree.branch)
411
411
        merger.merge_type = _mod_merge.Merge3Merger
412
412
        merger.do_merge()
413
 
        self.assertFileEqual(b'a\n'
414
 
                             b'<<<<<<< TREE\n'
415
 
                             b'=======\n'
416
 
                             b'c\n'
417
 
                             b'>>>>>>> MERGE-SOURCE\n',
418
 
                             b'this/file')
 
413
        self.assertFileEqual('a\n'
 
414
                             '<<<<<<< TREE\n'
 
415
                             '=======\n'
 
416
                             'c\n'
 
417
                             '>>>>>>> MERGE-SOURCE\n',
 
418
                             'this/file')
419
419
 
420
420
    def test_merge_reverse_revision_range(self):
421
421
        tree = self.make_branch_and_tree(".")
2711
2711
            [('rename', ('b', 'c')),
2712
2712
             ('modify', ('foo', b'E content\n'))],
2713
2713
            revision_id=b'E-id')
2714
 
        builder.build_snapshot(['B-id', b'C-id'],
 
2714
        builder.build_snapshot([b'B-id', b'C-id'],
2715
2715
            [('rename', ('a', 'b'))], revision_id=b'D-id') # merged change
2716
2716
        wt_this = self.get_wt_from_builder(builder)
2717
 
        wt_base = wt_this.controldir.sprout('base', b'a-id').open_workingtree()
 
2717
        wt_base = wt_this.controldir.sprout('base', b'A-id').open_workingtree()
2718
2718
        wt_base.lock_read()
2719
2719
        self.addCleanup(wt_base.unlock)
2720
2720
        wt_lca1 = wt_this.controldir.sprout('b-tree', b'B-id').open_workingtree()
2735
2735
                           ((root_id, [root_id, root_id]), root_id, root_id),
2736
2736
                           ((u'a', [u'a', u'b']), u'c', u'b'),
2737
2737
                           ((False, [False, False]), False, False)),
2738
 
                          ('foo-id', True,
 
2738
                          (b'foo-id', True,
2739
2739
                           ((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
2740
2740
                           ((root_id, [root_id, root_id]), root_id, root_id),
2741
2741
                           ((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
3385
3385
                                                   factory, 'test factory')
3386
3386
        self.tree_a.merge_from_branch(self.tree_b.branch)
3387
3387
 
3388
 
        self.assertFileEqual(b"content_3", 'tree_a/file')
 
3388
        self.assertFileEqual("content_3", 'tree_a/file')
3389
3389
        self.assertLength(1, calls)
3390
3390
 
3391
3391
    def test_post_merge_hook_called(self):
3398
3398
 
3399
3399
        self.tree_a.merge_from_branch(self.tree_b.branch)
3400
3400
 
3401
 
        self.assertFileEqual(b"content_2", 'tree_a/file')
 
3401
        self.assertFileEqual("content_2", 'tree_a/file')
3402
3402
        self.assertLength(1, calls)