[Fwd: Re: [BUG] apply_changeset / generate_changeset use wrong base]

[Aaron Bentley]

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

John A Meinel wrote:
> Aaron Bentley wrote:

>>So, is this what we're saying?
>>1. Any changeset can be applied to a blank branch
> 
> 
> I would say that a "null:" based changeset can be applied to a blank
> branch, otherwise you wouldn't have the context.

A blank branch may happen to have the context.  We could do the same
- --basis trick as branch, or cache/centralized storage may have it.  I'd
rather have the changeset application code handle the case where the
context is missing, not the merge-base selection code.

Anyhow, I think we substantially agree on this, so we can move ahead
with getting this changeset code ready for inclusion.

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

iD8DBQFDQ/Og0F+nu1YWqI0RAh8TAJ9dQXtSQUb8KdzZPu1PXvYplTcZHQCeLvUM
Wmd1byXQrOvfpHE3cQND8iM=
=IIVo
-----END PGP SIGNATURE-----