/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/branch_implementations/test_branch.py

  • Committer: Robert Collins
  • Date: 2007-08-07 22:59:45 UTC
  • mfrom: (2681 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2682.
  • Revision ID: robertc@robertcollins.net-20070807225945-dlxppeb3we4lh897
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_branch.py
69
69
    def test_create_tree_with_merge(self):
70
70
        tree = self.create_tree_with_merge()
71
71
        ancestry_graph = tree.branch.repository.get_revision_graph('rev-3')
72
 
        self.assertEqual({'rev-1':[],
73
 
                          'rev-2':['rev-1'],
74
 
                          'rev-1.1.1':['rev-1'],
75
 
                          'rev-3':['rev-2', 'rev-1.1.1'],
 
72
        self.assertEqual({'rev-1':(),
 
73
                          'rev-2':('rev-1', ),
 
74
                          'rev-1.1.1':('rev-1', ),
 
75
                          'rev-3':('rev-2', 'rev-1.1.1', ),
76
76
                         }, ancestry_graph)
77
77
 
78
78
    def test_revision_ids_are_utf8(self):