At http://people.ubuntu.com/~robertc/baz2.0/repository
------------------------------------------------------------
revno: 3786
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Robert Collins <[EMAIL PROTECTED]>
branch nick: repository
timestamp: Fri 2008-11-14 18:03:31 +1100
message:
Merge divergence with bb-core.
modified:
bzrlib/tests/intertree_implementations/test_compare.py
test_compare.py-20060724101752-09ysswo1a92uqyoz-2
------------------------------------------------------------
revno: 3768.1.13
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Vincent Ladeuil <[EMAIL PROTECTED]>
branch nick: work
timestamp: Fri 2008-11-14 15:49:37 +1000
message:
merge bbc
modified:
bzrlib/inventory.py
inventory.py-20050309040759-6648b84ca2005b37
bzrlib/repository.py
rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3768.1.12
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Vincent Ladeuil <[EMAIL PROTECTED]>
branch nick: work
timestamp: Fri 2008-11-14 14:32:25 +1000
message:
Get rid of more failures related to not applicable tests.
* tests/intertree_implementations/test_compare.py:
(TestIterChanges.test_missing_in_target,
TestIterChanges.test_renamed_and_unknown): More not applicable
tests.
modified:
bzrlib/tests/intertree_implementations/test_compare.py
test_compare.py-20060724101752-09ysswo1a92uqyoz-2
=== modified file 'bzrlib/tests/intertree_implementations/test_compare.py'
--- a/bzrlib/tests/intertree_implementations/test_compare.py 2008-11-14
02:47:44 +0000
+++ b/bzrlib/tests/intertree_implementations/test_compare.py 2008-11-14
04:32:25 +0000
@@ -680,6 +680,8 @@
shutil.rmtree('2/b')
# TODO ? have a symlink here?
tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
+ self.not_applicable_if_missing_in('a', tree2)
+ self.not_applicable_if_missing_in('b', tree2)
root_id = tree1.path2id('')
expected = sorted([
self.missing('a-id', 'a', 'a', root_id, 'file'),
@@ -1478,6 +1480,7 @@
os.rename('tree2/a', 'tree2/a2')
tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
+ self.not_applicable_if_missing_in('a', tree2)
expected = sorted([
self.missing('a-id', 'a', 'a', tree2.get_root_id(), 'file'),
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
