← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_too_much.py

Merge in upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_too_much.py
725
725
        assert '|||||||' not in conflict_text
726
726
        assert 'hi world' not in conflict_text
727
727
        os.unlink('hello.OTHER')
 
728
        os.unlink('question.OTHER')
 
729
        self.runbzr('remerge jello --merge-type weave', retcode=3)
728
730
        self.runbzr('remerge hello --merge-type weave', retcode=1)
729
731
        assert os.path.exists('hello.OTHER')
 
732
        self.assertIs(False, os.path.exists('question.OTHER'))
730
733
        file_id = self.runbzr('file-id hello')
731
734
        file_id = self.runbzr('file-id hello.THIS', retcode=3)
732
735
        self.runbzr('remerge --merge-type weave', retcode=1)