At http://people.ubuntu.com/~robertc/baz2.0/repository
------------------------------------------------------------
revno: 3778
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Robert Collins <[EMAIL PROTECTED]>
branch nick: repository
timestamp: Fri 2008-11-14 13:19:53 +1100
message:
Merge bb-core.
modified:
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3768.1.7
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Vincent Ladeuil <[EMAIL PROTECTED]>
branch nick: work
timestamp: Fri 2008-11-14 12:00:10 +1000
message:
merge brisbane-core
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/chk_serializer.py
chk_serializer.py-20081002064345-2tofdfj2eqq01h4b-1
bzrlib/inventory.py
inventory.py-20050309040759-6648b84ca2005b37
bzrlib/repofmt/pack_repo.py
pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py
rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_pack_repository.py
test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_repository.py
test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 3768.1.6
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Vincent Ladeuil <[EMAIL PROTECTED]>
branch nick: work
timestamp: Fri 2008-11-14 11:55:20 +1000
message:
Fix typo.
modified:
bzrlib/inventory.py
inventory.py-20050309040759-6648b84ca2005b37
------------------------------------------------------------
revno: 3768.1.5
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Vincent Ladeuil <[EMAIL PROTECTED]>
branch nick: work
timestamp: Fri 2008-11-14 11:18:32 +1000
message:
Fix 19 intertree_implementations.test_compare.TestIterChanges failures.
* inventory.py:
(CHKInventory.iter_changes): Don't report spurious empty changes.
modified:
bzrlib/inventory.py
inventory.py-20050309040759-6648b84ca2005b37
------------------------------------------------------------
revno: 3768.1.4
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Vincent Ladeuil <[EMAIL PROTECTED]>
branch nick: work
timestamp: Fri 2008-11-14 10:25:49 +1000
message:
merge brisbane-core @3775
modified:
bzrlib/chk_map.py
chk_map.py-20081001014447-ue6kkuhofvdecvxa-1
bzrlib/repofmt/pack_repo.py
pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 3768.1.3
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Vincent Ladeuil <[EMAIL PROTECTED]>
branch nick: work
timestamp: Fri 2008-11-14 10:11:23 +1000
message:
merge [EMAIL PROTECTED]
modified:
bzrlib/tests/intertree_implementations/__init__.py
__init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree_4.py
workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3768.1.2
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Vincent Ladeuil <[EMAIL PROTECTED]>
branch nick: work
timestamp: Thu 2008-11-13 15:37:02 +1000
message:
remerge rob mega-hack
modified:
bzrlib/chk_map.py
chk_map.py-20081001014447-ue6kkuhofvdecvxa-1
bzrlib/inventory.py
inventory.py-20050309040759-6648b84ca2005b37
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3768.1.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Vincent Ladeuil <[EMAIL PROTECTED]>
branch nick: work
timestamp: Thu 2008-11-13 15:36:22 +1000
message:
remerge trivial fixes
modified:
bzrlib/repofmt/pack_repo.py
pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py
rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_pack_repository.py
test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
=== modified file 'bzrlib/inventory.py'
--- a/bzrlib/inventory.py 2008-11-14 02:13:12 +0000
+++ b/bzrlib/inventory.py 2008-11-14 02:19:53 +0000
@@ -1601,6 +1601,13 @@
parent = (basis_parent, self_parent)
name = (basis_name, self_name)
executable = (basis_executable, self_executable)
+ if (not changed_content
+ and parent[0] == parent[1]
+ and name[0] == name[1]
+ and executable[0] == executable[1]):
+ # Could happen when only the revision changed for a directory
+ # for instance.
+ continue
yield (file_id, (path_in_source, path_in_target), changed_content,
versioned, parent, name, kind, executable)
=== modified file 'bzrlib/tree.py'
--- a/bzrlib/tree.py 2008-11-13 04:06:26 +0000
+++ b/bzrlib/tree.py 2008-11-14 00:11:23 +0000
@@ -863,6 +863,7 @@
# XXX: Ugly hack - testing only, really want a separate inter? or
# perhaps helpers and split this function up?
try:
+ # Only CHK inventories have id_to_entry attribute
self.source.inventory.id_to_entry
self.target.inventory.id_to_entry
except:
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
