~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interrepository/test_fetch.py

  • Committer: Patch Queue Manager
  • Date: 2012-04-02 02:36:45 UTC
  • mfrom: (6471.1.7 iter-child-entries)
  • Revision ID: pqm@pqm.ubuntu.com-20120402023645-28dkcb0awh3i1flc
(jelmer) Add Tree.iter_child_entries(). (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
298
298
        stacked_branch.lock_read()
299
299
        self.addCleanup(stacked_branch.unlock)
300
300
        stacked_second_tree = stacked_branch.repository.revision_tree('second')
301
 
        self.assertEqual(second_tree.root_inventory,
302
 
            stacked_second_tree.root_inventory)
 
301
        self.assertEqual(second_tree, stacked_second_tree)
303
302
        # Finally, it's not enough to see that the basis inventories are
304
303
        # present.  The texts introduced in merge (and only those) should be
305
304
        # present, and also generating a stream should succeed without blowing