At http://people.ubuntu.com/~robertc/baz2.0/repository
------------------------------------------------------------
revno: 3782
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Robert Collins <[EMAIL PROTECTED]>
branch nick: repository
timestamp: Fri 2008-11-14 15:06:41 +1100
message:
Do not alter InventoryDirectory objects provided to Inventory.apply_delta.
modified:
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
=== modified file 'bzrlib/inventory.py'
--- a/bzrlib/inventory.py 2008-11-14 03:36:34 +0000
+++ b/bzrlib/inventory.py 2008-11-14 04:06:41 +0000
@@ -969,7 +969,11 @@
# Pop the child which to allow detection of children whose
# parents were deleted and which were not reattached to a new
# parent.
- new_entry.children = children.pop(new_entry.file_id, {})
+ replacement = InventoryDirectory(new_entry.file_id,
+ new_entry.name, new_entry.parent_id)
+ replacement.revision = new_entry.revision
+ replacement.children = children.pop(replacement.file_id, {})
+ new_entry = replacement
self.add(new_entry)
if len(children):
# Get the parent id that was deleted
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
