/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/per_interrepository/test_fetch.py

  • Committer: Vincent Ladeuil
  • Date: 2012-03-08 18:30:33 UTC
  • mfrom: (6487 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6488.
  • Revision ID: v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interrepository/test_fetch.py
383
383
        (stacked_left_tree,
384
384
         stacked_right_tree) = new_stacked_branch.repository.revision_trees(
385
385
            ['left', 'right'])
386
 
        self.assertEqual(left_tree.root_inventory,
387
 
                stacked_left_tree.root_inventory)
388
 
        self.assertEqual(right_tree.root_inventory,
389
 
                stacked_right_tree.root_inventory)
 
386
        self.assertEqual(left_tree, stacked_left_tree)
 
387
        self.assertEqual(right_tree, stacked_right_tree)
390
388
        # Finally, it's not enough to see that the basis inventories are
391
389
        # present.  The texts introduced in merge (and only those) should be
392
390
        # present, and also generating a stream should succeed without blowing