← Back to branch summary

~toddy/bzr/bzr.i18n

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ancestry.py

  • Committer: Tobias Toedter
  • Date: 2007-12-30 18:52:13 UTC
  • mfrom: (2438.1.708 +trunk)
  • Revision ID: t.toedter@gmx.net-20071230185213-7xiqpbtshmnsf073
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ancestry.py
23
23
from bzrlib.branch import Branch
24
24
from bzrlib.branchbuilder import BranchBuilder
25
25
from bzrlib.revision import is_ancestor
26
 
from bzrlib.symbol_versioning import zero_ninetythree
 
26
from bzrlib.symbol_versioning import one_zero
27
27
 
28
28
 
29
29
class TestAncestry(TestCaseWithMemoryTransport):
45
45
 
46
46
    def test_none_is_ancestor_empty_branch(self):
47
47
        branch = self.make_branch('.')
48
 
        self.assertTrue(self.applyDeprecated(zero_ninetythree,
 
48
        self.assertTrue(self.applyDeprecated(one_zero,
49
49
                        is_ancestor, 'null:', 'null:', branch))
50
50
 
51
51
    def test_none_is_ancestor_non_empty_branch(self):
54
54
        branch = builder.get_branch()
55
55
        branch.lock_read()
56
56
        self.addCleanup(branch.unlock)
57
 
        self.assertTrue(self.applyDeprecated(zero_ninetythree,
 
57
        self.assertTrue(self.applyDeprecated(one_zero,
58
58
                        is_ancestor, 'null:', 'null:', branch))
59
 
        self.assertTrue(self.applyDeprecated(zero_ninetythree,
 
59
        self.assertTrue(self.applyDeprecated(one_zero,
60
60
                        is_ancestor, rev_id, 'null:',  branch))
61
 
        self.assertFalse(self.applyDeprecated(zero_ninetythree,
 
61
        self.assertFalse(self.applyDeprecated(one_zero,
62
62
                         is_ancestor, 'null:', rev_id, branch))
63
63
 
64
64