Rev 3175: Set the inventory revision_id in to_inventory. in http://people.ubuntu.com/~robertc/baz2.0/inventory.journalled
Robert Collins
robertc at robertcollins.net
Sun Jan 6 21:21:44 GMT 2008
At http://people.ubuntu.com/~robertc/baz2.0/inventory.journalled
------------------------------------------------------------
revno: 3175
revision-id:robertc at robertcollins.net-20080106212137-84leoi2cp6vorge0
parent: robertc at robertcollins.net-20080106200839-4bmbk3dv23w1owi8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inventory.journalled
timestamp: Mon 2008-01-07 08:21:37 +1100
message:
Set the inventory revision_id in to_inventory.
modified:
bzrlib/journalled_inventory.py journalled_inventory-20080103020931-0ht5n40kwc0p7fy1-1
bzrlib/tests/test_journalled_inv.py test_journalled_inv.-20080103012121-ny2w9slze5jgty8i-1
=== modified file 'bzrlib/journalled_inventory.py'
--- a/bzrlib/journalled_inventory.py 2008-01-04 02:10:02 +0000
+++ b/bzrlib/journalled_inventory.py 2008-01-06 21:21:37 +0000
@@ -202,6 +202,7 @@
name = basename(path)
result.add(entry_factory[content[0]](
content, name, parent_id, file_id, last_modified))
+ result.revision_id = self.version
return result
=== modified file 'bzrlib/tests/test_journalled_inv.py'
--- a/bzrlib/tests/test_journalled_inv.py 2008-01-04 02:10:02 +0000
+++ b/bzrlib/tests/test_journalled_inv.py 2008-01-06 21:21:37 +0000
@@ -454,7 +454,7 @@
delta = inventory.make_inv_delta(old_inv, inv)
journal = journalled_inventory.InventoryJournal(versioned_root=True,
tree_references=True)
- lines = journal.delta_to_lines(NULL_REVISION, 'something', delta)
+ lines = journal.delta_to_lines(NULL_REVISION, inv.revision_id, delta)
serialised = ''.join(lines)
self.assertIsInstance(serialised, str)
self.assertEqual(expected, serialised)
More information about the bazaar-commits
mailing list