← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ancestry.py

  • Committer: Vincent Ladeuil
  • Date: 2007-07-15 11:24:18 UTC
  • mfrom: (2617 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070715112418-9nn4n6esxv60ny4b
merge bzr.dev@1617

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ancestry.py
44
44
 
45
45
    def test_none_is_ancestor_empty_branch(self):
46
46
        branch = self.make_branch('.')
47
 
        self.assertTrue(is_ancestor(None, None, branch))
 
47
        self.assertTrue(is_ancestor('null:', 'null:', branch))
48
48
 
49
49
    def test_none_is_ancestor_non_empty_branch(self):
50
50
        builder = BranchBuilder(self.get_transport())
51
51
        rev_id = builder.build_commit()
52
52
        branch = builder.get_branch()
53
 
        self.assertTrue(is_ancestor(None, None, branch))
54
 
        self.assertTrue(is_ancestor(rev_id, None, branch))
55
 
        self.assertFalse(is_ancestor(None, rev_id, branch))
 
53
        self.assertTrue(is_ancestor('null:', 'null:', branch))
 
54
        self.assertTrue(is_ancestor(rev_id, 'null:',  branch))
 
55
        self.assertFalse(is_ancestor('null:', rev_id, branch))
56
56
 
57
57
 
58
58
# TODO: check that ancestry is updated to include indirectly merged revisions