~bzr-pqm/bzr/bzr.dev

Committer: Aaron Bentley
Date: 2006-02-14 17:23:26 UTC
mto: (1558.1.4 Aaron's integration) (1534.9.2 Transactional Tree Transforms) (1185.50.82 bzr-jam-integration) (2027.1.2 revert-subpath-56549)
mto: This revision was merged to the branch mainline in revision 1558.
Revision ID: abentley@panoramicfeedback.com-20060214172326-ec4712d0549ff7cd

Updated test to new conflict message

added added

removed removed

self.assertEqual(['1 conflicts encountered.',

'Updated to revision 2.'],

err.split('\n')[1:3])

self.assertContainsRe(err, 'Diff3 conflict encountered in.*file\n')

self.assertContainsRe(err, 'Text conflict in file\n')

self.assertEqual('', out)