~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-06 23:38:33 UTC
  • mfrom: (6463 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120206233833-w0nbclw7d1xj4twj
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
3713
3713
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3714
3714
                         remaining_conflicts.pop())
3715
3715
        self.assertLength(1, warnings)
3716
 
        self.assertStartsWith(warnings[0], 'donttouchmypreciouuus')
 
3716
        self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
3717
3717
 
3718
3718
 
3719
3719
class TestTransformHooks(tests.TestCaseWithTransport):