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

[John Arbash Meinel]

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

John Arbash Meinel wrote:
| 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
| =:->

Just one small comment on my side, if we decide to include this in 'bzr check'
and 'bzr reconcile' than we need to change the 'assert' into an exception which
then tells the user to try check/reconcile.

But that would conflict with Martin's "no assert" patch, so I'd like to wait for
that to land.

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

iEYEARECAAYFAkgXbeEACgkQJdeBCYSNAAMiHACgyhXt8lSvZQIBtWSlDB14QAyx
TsoAn1mq8ZDxkvDAEGi3lzFM47857n44
=Lwao
-----END PGP SIGNATURE-----