[BUG] apply_changeset / generate_changeset use wrong base

[Aaron Bentley]

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

John A Meinel wrote:
> Yeah, our last conversation wasn't very clear.

> I was prefer to call common_ancestor at the time of application, because
> there might have been merges, etc, since the time the changeset was
> created, which might change the best base was.

Same here.

> PS> Part of the problem was that I wrote the changeset code before
> common_ancestor got fixed. I know it is currently using
> "_find_best_base" which was a reimplementation of common_ancestor, meant
> to handle the branching ancestry, at a time when common_ancestor did
> not. So there are a few places like that which need to be cleaned up.

I would actually prefer if by default, it always picked the last commit
in OTHER_BRANCH as the changeset base, because that makes it clearer
what will happen to the target tree if the changeset is applied.

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

iD8DBQFDOWSb0F+nu1YWqI0RAibIAJ9a/zhF+lUS+3sh7TnN5Rytb4CzmACfSIuX
0CB9N9cVCxjrGesId407S00=
=1ntn
-----END PGP SIGNATURE-----