[MERGE] Fetch into stacked branches works correctly
aaron at aaronbentley.com
Mon Jul 28 07:24:05 BST 2008
-----BEGIN PGP SIGNED MESSAGE-----
This patch fixes Bazaar so fetching into a stacked branch works
correctly. Jonathan Lange discovered this bug. I helped code up the
fix and test.
The problem is that the Packer approach to fetch has some bad layering.
It attempts to ensure all the texts that are fetched can be
constructed, but on the pack level, the compression parents are missing.
So the test fails erroneously.
For fetching *from* stacked branches, we need to work on a higher level,
so we might as well use the same codepath when fetching *to* stacked
So this patch changes fetch to use the KnitRepoFetcher when the *target*
is stacked, not only when the *source* is stacked.
Like my previous patch in this area, this issue would have been masked
when the stacked_on branch was the source.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 5378 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080728/e9048b2e/attachment.bin
More information about the bazaar