[PATCH] Merge needs no BASE_SPEC, better docs

[Aaron Bentley]

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

John Arbash Meinel wrote:
| So you have a base tree, which you commit up to rev 10. You then branch
| this, and work continues on both trees. You then merge the 2 changes to
| the base tree into your branch. I'm pretty sure common ancestor will
| find those correctly, since the revision numbers line up perfectly.
| But now branch1 technically is branched off of base at 12, will it realize
| this when you go to merge again at branch at 20? Or will it only see that
| the common ancestor is base at 10?

It will say the last common ancestor is base at 10.

I wouldn't say base at 12 is ever the last common ancestor, because it
doesn't appear in the revision history of one of the branches.  I'd call
it the last common merge.

I would really, really like to do last-common-merge instead of
last-common-ancestor.  I don't have the metadata I need yet.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFClfbV0F+nu1YWqI0RAseuAJ9g+n11sgJKhyWm3RK0mIV0cUXJHgCfQXMU
6T3IwZWhe+16xnK/0o7wyS4=
=n+S7
-----END PGP SIGNATURE-----