update on stack merging

[Martin Pool]

So the specific test that I've added, and which is now failing, is this:

=== modified file
'bzrlib/tests/repository_implementations/test_add_fallback_repository.py'
--- bzrlib/tests/repository_implementations/test_add_fallback_repository.py	2008-02-20
00:42:39 +0000
+++ bzrlib/tests/repository_implementations/test_add_fallback_repository.py	2008-07-11
01:36:02 +0000
@@ -17,6 +17,7 @@
 """Tests for Repository.add_fallback_repository."""

 from bzrlib import errors
+from bzrlib.revision import NULL_REVISION
 from bzrlib.tests import TestNotApplicable
 from bzrlib.tests.repository_implementations import TestCaseWithRepository

@@ -33,4 +34,11 @@
         repo.add_fallback_repository(tree.branch.repository)
         # the repository has been added correctly if we can query against it.
         revision_id = tree.commit('1st post')
-        self.assertEqual(set([revision_id]), set(repo.all_revision_ids()))
+        repo.lock_read()
+        try:
+            self.assertEqual(set([revision_id]), set(repo.all_revision_ids()))
+            # and can also query the parent map
+            self.assertEqual({revision_id: (NULL_REVISION,)},
+                repo.get_parent_map([revision_id]))
+        finally:
+            repo.unlock()

Instead of getting the correct dictionary it gets an empty dictionary.


-- 
Martin <http://launchpad.net/~mbp/>