/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: 2018-11-16 19:47:19 UTC
  • mfrom: (7178 work)
  • mto: This revision was merged to the branch mainline in revision 7179.
  • Revision ID: jelmer@jelmer.uk-20181116194719-m5ut2wfuze5x9s1p
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_remerge.py
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')