/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ancestry.py

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ancestry.py
22
22
from bzrlib.tests import TestCaseWithMemoryTransport
23
23
from bzrlib.branch import Branch
24
24
from bzrlib.branchbuilder import BranchBuilder
25
 
from bzrlib.symbol_versioning import one_zero
26
25
 
27
26
 
28
27
class TestAncestry(TestCaseWithMemoryTransport):
42
41
            rev_id_two, branch)
43
42
        self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch)
44
43
 
45
 
 
46
44
# TODO: check that ancestry is updated to include indirectly merged revisions