← 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: Martin Pool
  • Date: 2007-04-04 01:22:11 UTC
  • mfrom: (2393.1.1 bzr.docs)
  • mto: This revision was merged to the branch mainline in revision 2397.
  • Revision ID: mbp@sourcefrog.net-20070404012211-sq269me6bai9m6xk
merge trunk and doc fix from elliot

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
18
18
import re
19
19
import sys
20
20
 
21
 
from bzrlib import bzrdir, repository
 
21
from bzrlib import (
 
22
    bzrdir,
 
23
    errors,
 
24
    repository,
 
25
    )
22
26
from bzrlib.branch import Branch
23
27
from bzrlib.bzrdir import BzrDir
24
28
from bzrlib.builtins import merge
155
159
        # even though the text, name, parent_id, etc., were unchanged.
156
160
        self.assertTrue('rev2' in root_knit)
157
161
 
 
162
    def test_fetch_incompatible(self):
 
163
        knit_tree = self.make_branch_and_tree('knit', format='knit')
 
164
        knit3_tree = self.make_branch_and_tree('knit3',
 
165
            format='dirstate-with-subtree')
 
166
        knit3_tree.commit('blah')
 
167
        self.assertRaises(errors.IncompatibleRepositories,
 
168
                          knit_tree.branch.fetch, knit3_tree.branch)
 
169
 
158
170
 
159
171
class TestMergeFetch(TestCaseWithTransport):
160
172