[merge][#295350] fix another "revision not present" in stacked repositories

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> This is a rolled-up patch of stacking fixes but the new part is this.
> I think the comments are pretty self-explanatory.

Interestingly you have a subtle but serious bug in this code. Specifically:

=== modified file 'bzrlib/repofmt/knitrepo.py'
- --- bzrlib/repofmt/knitrepo.py	2008-09-08 14:00:22 +0000
+++ bzrlib/repofmt/knitrepo.py	2008-11-19 07:49:22 +0000
@@ -124,8 +124,8 @@
         self._commit_builder_class = _commit_builder_class
         self._serializer = _serializer
         self._reconcile_fixes_text_parents = True
- -        self._fetch_uses_deltas = True
         self._fetch_order = 'topological'
+        _fetch_uses_deltas = True


This actually disables using deltas for fetching between knit or pack
repositories, which would be a pretty serious regression. (Notice that
the latter form doesn't use "self." which I assume is because Martin
just indented his class-global value.)

Anyway, this was fortunately caught in a fetch test, which used:

        # precondition
        self.assertTrue(target._fetch_uses_deltas)


This was fixed as part of getting this branch submitted to bzr.dev. I
assume Martin ran afoul of a few merge conflicts which is why he didn't
get it merged yesterday.

With any luck, I'll land this later today.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkknHokACgkQJdeBCYSNAAMMUQCgmTspu0Q55EF25HkmXteV8wpL
7oQAn3p88iCpqgakjnBBpFf/KmmBuiGT
=MsLr
-----END PGP SIGNATURE-----