[MERGE] Fix non-rich to rich-root fetch

[Aaron Bentley]

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

Hi all,

This patch solves all the bugs I know about when fetching from any
non-rich-root repository into any rich-root repository.  I have used an
earlier version to successfully convert the Bazaar source tree, which
has ghosts and unique root ids, into rich-root-pack format.

It adds some tests that are specific to this scenario to the
bzrlib/tests/test_fetch.  I did not see any value in adding these to the
standard interrepository fetch tests.

It
- - adds entries in topological order
- - notes ghost parents correctly in the target*
- - allows the root-id of a (supposedly non-rich) branch to change

I have recently learned thing about our SHA1 handling that convince me
that rich-root-pack is probably a better choice for our next default
format than the pack-1.5 format I planned.  These changes are one of the
things that needs to happen before we can do that.

Aaron

* However, it does assume that a ghost parent's root-id is the same as
  the child's root-id.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIEeYb0F+nu1YWqI0RAmMoAJ9WNwZR0QACmWtwr0oLJFs7Xo5EpACfRLUf
FquW2Jm9vstpW9xOgmmk59U=
=vjOh
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fetch1to2-3383.patch
Type: text/x-diff
Size: 13282 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080425/4127147b/attachment-0002.bin