← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testinv.py

  • Committer: Robert Collins
  • Date: 2005-10-06 01:30:12 UTC
  • Revision ID: robertc@robertcollins.net-20051006013012-27a91dece71dc318
we do not need revision_trees in commit, parent inventories are sufficient

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testinv.py
270
270
    def test_snapshot_merge_identical_different_revid(self):
271
271
        # This tests that a commit with two identical parents, one of which has
272
272
        # a different revision id, results in a new revision id in the entry.
 
273
        # 1->other, commit a merge of other against 1, results in 2.
273
274
        other_ie = inventory.InventoryFile('fileid', 'newname', self.file_1.parent_id)
274
275
        other_ie = inventory.InventoryFile('fileid', 'file', self.file_1.parent_id)
275
276
        other_ie.revision = '1'