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

  • Committer: Jelmer Vernooij
  • Date: 2020-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_remerge.py
24
24
class TestRemerge(TestCaseWithTransport):
25
25
 
26
26
    def make_file(self, name, contents):
27
 
        with open(name, 'wb') as f:
 
27
        with open(name, 'w') as f:
28
28
            f.write(contents)
29
29
 
30
30
    def create_conflicts(self):
66
66
        os.unlink('this/question.OTHER')
67
67
 
68
68
        self.run_bzr_error(['jello is not versioned'],
69
 
                     'remerge jello --merge-type weave', working_dir='this')
 
69
                           'remerge jello --merge-type weave', working_dir='this')
70
70
        self.run_bzr_error(['conflicts encountered'],
71
71
                           'remerge hello --merge-type weave',
72
72
                           retcode=1, working_dir='this')