/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_repository/test_commit_builder.py

  • Committer: Jonathan Riddell
  • Date: 2011-05-18 12:18:39 UTC
  • mfrom: (5890 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5897.
  • Revision ID: jriddell@canonical.com-20110518121839-3jphfes9i8hpyt2e
merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_commit_builder.py
304
304
            # pointless commit.
305
305
            self.assertFalse(builder.any_changes())
306
306
            builder.finish_inventory()
307
 
            new_root = tree.branch.repository.get_inventory(
308
 
                builder._new_revision_id).root
 
307
            builder_tree = builder.revision_tree()
 
308
            new_root_id = builder_tree.get_root_id()
 
309
            new_root_revision = builder_tree.get_file_revision(new_root_id)
309
310
            if tree.branch.repository.supports_rich_root():
310
311
                # We should not have seen a new root revision
311
 
                self.assertEqual(old_revision_id, new_root.revision)
 
312
                self.assertEqual(old_revision_id, new_root_revision)
312
313
            else:
313
314
                # We should see a new root revision
314
 
                self.assertNotEqual(old_revision_id, new_root.revision)
 
315
                self.assertNotEqual(old_revision_id, new_root_revision)
315
316
        finally:
316
317
            builder.abort()
317
318
            tree.unlock()