← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ancestry.py

Merge from aaron. Whee, we are synced. Yay. Begone the foul demons of merge conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ancestry.py
39
39
                  allow_pointless=True,
40
40
                  rev_id='tester@foo--2')
41
41
 
42
 
        ancs = b.get_ancestry('tester@foo--2')
 
42
        ancs = b.storage.get_ancestry('tester@foo--2')
43
43
        self.assertEqual([None, 'tester@foo--1', 'tester@foo--2'], ancs)
44
44
        self.assertEqual([None, 'tester@foo--1'], 
45
 
                         b.get_ancestry('tester@foo--1'))
 
45
                         b.storage.get_ancestry('tester@foo--1'))
46
46
 
47
47
    def test_none_is_always_an_ancestor(self):
48
48
        b = Branch.initialize('.')