At http://people.ubuntu.com/~robertc/baz2.0/bug-304841

------------------------------------------------------------
revno: 4053
revision-id: [email protected]
parent: [email protected]
committer: Robert Collins <[email protected]>
branch nick: bug-304841
timestamp: Thu 2009-02-26 11:39:51 +1100
message:
  Roll back the overly big fix to bug 304841, allowing _fetch order to move to 
RepositoryFormat.
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py      2009-02-25 00:31:09 +0000
+++ b/bzrlib/repository.py      2009-02-26 00:39:51 +0000
@@ -637,7 +637,6 @@
         self.inventories.add_fallback_versioned_files(repository.inventories)
         self.revisions.add_fallback_versioned_files(repository.revisions)
         self.signatures.add_fallback_versioned_files(repository.signatures)
-        self._fetch_order = 'topological'
 
     def _check_fallback_repository(self, repository):
         """Check that this repository can fallback to repository safely.

=== modified file 'bzrlib/tests/per_repository/test_add_fallback_repository.py'
--- a/bzrlib/tests/per_repository/test_add_fallback_repository.py       
2009-02-13 00:52:18 +0000
+++ b/bzrlib/tests/per_repository/test_add_fallback_repository.py       
2009-02-26 00:39:51 +0000
@@ -65,13 +65,3 @@
         self.addCleanup(other.unlock)
         self.assertEqual({revision_id: (NULL_REVISION,)},
             repo.get_graph(other).get_parent_map([revision_id]))
-
-    def test_add_fallback_sets_fetch_order(self):
-        repo = self.make_repository('repo')
-        tree = self.make_branch_and_tree('branch')
-        if not repo._format.supports_external_lookups:
-            self.assertRaises(errors.UnstackableRepositoryFormat,
-                repo.add_fallback_repository, tree.branch.repository)
-            raise TestNotApplicable
-        repo.add_fallback_repository(tree.branch.repository)
-        self.assertEqual('topological', repo._fetch_order)


-- 
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits

Reply via email to