/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/blackbox/test_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-13 00:24:33 UTC
  • mfrom: (7037 work)
  • mto: This revision was merged to the branch mainline in revision 7039.
  • Revision ID: jelmer@jelmer.uk-20180713002433-dr601ols49ge07fr
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_merge.py
230
230
        tree, other = self.create_conflicting_branches()
231
231
        self.run_bzr('merge ../other', working_dir='tree',
232
232
                     retcode=1)
233
 
        self.assertFileEqual('a\nb\nc\n', 'tree/fname.BASE')
234
 
        self.assertFileEqual('a\nB\nD\n', 'tree/fname.OTHER')
235
 
        self.assertFileEqual('a\nB\nC\n', 'tree/fname.THIS')
 
233
        self.assertFileEqual(b'a\nb\nc\n', 'tree/fname.BASE')
 
234
        self.assertFileEqual(b'a\nB\nD\n', 'tree/fname.OTHER')
 
235
        self.assertFileEqual(b'a\nB\nC\n', 'tree/fname.THIS')
236
236
 
237
237
    def test_weave_conflict_leaves_base_this_other_files(self):
238
238
        tree, other = self.create_conflicting_branches()
239
239
        self.run_bzr('merge ../other --weave', working_dir='tree',
240
240
                     retcode=1)
241
 
        self.assertFileEqual('a\nb\nc\n', 'tree/fname.BASE')
242
 
        self.assertFileEqual('a\nB\nD\n', 'tree/fname.OTHER')
243
 
        self.assertFileEqual('a\nB\nC\n', 'tree/fname.THIS')
 
241
        self.assertFileEqual(b'a\nb\nc\n', 'tree/fname.BASE')
 
242
        self.assertFileEqual(b'a\nB\nD\n', 'tree/fname.OTHER')
 
243
        self.assertFileEqual(b'a\nB\nC\n', 'tree/fname.THIS')
244
244
 
245
245
    def test_merge_remember(self):
246
246
        """Merge changes from one branch to another, test submit location."""
523
523
        for f in ('a', 'b', 'c', 'd'):
524
524
            self.build_tree(['source/'+f])
525
525
            source.add(f)
526
 
            source.commit('added '+f, rev_id=b'rev_'+f)
 
526
            source.commit('added '+f, rev_id=b'rev_'+f.encode('ascii'))
527
527
        # target branch
528
528
        target = source.controldir.sprout('target', b'rev_a').open_workingtree()
529
529
        self.assertDirectoryContent('target', ['.bzr', 'a'])
612
612
        self.build_tree_contents([('other/file', b"c\na\nb\n")])
613
613
        other_tree.commit('rev3b')
614
614
        self.run_bzr('merge --weave -d this other -r -2..-1')
615
 
        self.assertFileEqual('c\na\n', 'this/file')
 
615
        self.assertFileEqual(b'c\na\n', 'this/file')
616
616
 
617
617
    def test_lca_merge_criss_cross(self):
618
618
        tree_a = self.make_branch_and_tree('a')
637
637
        tree_a.commit('', rev_id=b'rev3a')
638
638
        tree_b.commit('', rev_id=b'rev3b')
639
639
        out, err = self.run_bzr(['merge', '-d', 'a', 'b', '--lca'], retcode=1)
640
 
        self.assertFileEqual('base-contents\n<<<<<<< TREE\nthis-contents\n'
641
 
                             '=======\nother-contents\n>>>>>>> MERGE-SOURCE\n',
642
 
                             'a/file')
 
640
        self.assertFileEqual(b'base-contents\n<<<<<<< TREE\nthis-contents\n'
 
641
                             b'=======\nother-contents\n>>>>>>> MERGE-SOURCE\n',
 
642
                             b'a/file')
643
643
 
644
644
    def test_merge_preview(self):
645
645
        this_tree = self.make_branch_and_tree('this')