← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_reconcile.py

(jelmer) Several more fixes to allow running bzr.dev against bzr-svn (Jelmer
 Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_reconcile.py
19
19
from bzrlib import errors, reconcile
20
20
from bzrlib.symbol_versioning import deprecated_in
21
21
from bzrlib.tests.per_branch import TestCaseWithBranch
 
22
from bzrlib.tests import TestNotApplicable
22
23
 
23
24
 
24
25
class TestBranchReconcile(TestCaseWithBranch):
75
76
 
76
77
    def test_reconcile_handles_ghosts_in_revhistory(self):
77
78
        tree = self.make_branch_and_tree('test')
 
79
        if not tree.branch.repository._format.supports_ghosts:
 
80
            raise TestNotApplicable("repository format does not support ghosts")
78
81
        tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
79
82
        r1 = tree.commit('one')
80
83
        r2 = tree.commit('two')