Description of merge algorithms

[John Arbash Meinel]

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

Russ Brown wrote:
| I'm just evaluating bazaar and while trialling a scenario I encountered
| a criss-cross merge and was told to try --weave. But recently on this
| list I saw mention of --lca being a quicker and giving better results
| for this purpose.
|
| I've not been able to find any docs that describe each algorithm with
| guidance on when each should be used. Could someone point me at some?
|
| Also, if lca is better than for dealing with a criss-cross merge, should
| merge not recommend that instead instead of weave?
|
| Thanks.
|

I believe it does now, since Martin's latest patch. (So it should recommend
- --lca in 1.4)

http://revctrl.net

Has some description of different merge algorithms, though I think our current
'--weave' is not actually a Weave merge, but a hybrid. And LCA is a faster (but
similar) variant.

I don't know if Aaron has fully documented LCA anywhere other than on the
mailing list, certainly that would be a doc that would fit well in doc/developers/*

John
=:->

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

iD8DBQFH/Hx6JdeBCYSNAAMRAmMJAJ9LQ/Dx2XtBNBVDxQO87jrNzE409gCgkYm8
066tmOMq6qxBUaN7g/5O9w4=
=nckK
-----END PGP SIGNATURE-----