← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_fetch.py

  • Committer: John Arbash Meinel
  • Date: 2008-08-14 17:08:56 UTC
  • mfrom: (3629 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3633.
  • Revision ID: john@arbash-meinel.com-20080814170856-p2ie5z7l6vowrftz
merge bzr.dev 3629, update NEWS entry to be in correct location.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
170
170
        knit3_tree = self.make_branch_and_tree('knit3',
171
171
            format='dirstate-with-subtree')
172
172
        knit3_tree.commit('blah')
173
 
        self.assertRaises(errors.IncompatibleRepositories,
174
 
                          knit_tree.branch.fetch, knit3_tree.branch)
 
173
        e = self.assertRaises(errors.IncompatibleRepositories,
 
174
                              knit_tree.branch.fetch, knit3_tree.branch)
 
175
        self.assertContainsRe(str(e),
 
176
            r"(?m).*/knit.*\nis not compatible with\n.*/knit3/.*\n"
 
177
            r"different rich-root support")
175
178
 
176
179
 
177
180
class TestMergeFetch(TestCaseWithTransport):