[MERGE][bug #177855] ``bzr reconcile`` fixes invalid branch history

[John Arbash Meinel]

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

We had several repeated bug reports about branches with non-canonical histories.
The attached batch implements a Branch.reconcile() which can fix this, and
updates Branch.check() to look for it.

While working in this code, I noticed that RepositoryReconciler() supports an
'other' field, as do all of the Repository.reconcile() functions. However none
of the .reconcile() functions pass that value into the Reconciler objects.

Is there a reason for that? Is it just incomplete work?

I don't really like expecting that you can push invalid data into a branch, but
at the moment it is possible, and I don't really know another way to test
'check()' and 'reconcile()'. Since both of them require that the
branch/repository is broken in a given way.

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

iEYEARECAAYFAkgXUGkACgkQJdeBCYSNAAMEHQCfSdYx9vsoZ/ifTZOW+bD7c9z1
lSUAoKdypO+TcozFgIx6EGTqtekXOLur
=u6Bh
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: reconcile_rev_history_177855.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20080429/be768b26/attachment-0001.diff