← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-11-03 02:35:48 UTC
  • mfrom: (2067.3.7 cleanup-errors)
  • Revision ID: pqm@pqm.ubuntu.com-20061103023548-12e702bb911c4be2
(mbp) deprecate BzrNewError, change to using .internal_error on exceptions, etc

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remerge.py
78
78
        self.failIfExists('question.OTHER')
79
79
 
80
80
        file_id = self.run_bzr('file-id', 'hello')[0]
81
 
        self.run_bzr_error(['\'hello.THIS\' is not a versioned file'],
 
81
        self.run_bzr_error(['hello.THIS is not versioned'],
82
82
                           'file-id', 'hello.THIS')
83
83
 
84
84
        self.run_bzr_error(['conflicts encountered'],