recent changes

[Aaron Bentley]

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

Martin Pool wrote:
> Hi, just an update on what I've been up to:
> 
> Revisions now allow for tracking multiple parent revisions; those
> after the first are the revisions that have been merged-in.  This is a
> slight adjustment from what was previously planned, where the first
> revision would be stored specially.
> 
> Cherrypicked changes or removed changes need to be recorded
> separately.

A couple of points I came up with after our IRC discussion:

Since all ancestor revisions should be stored, making merges into
ancestors means that we need to store all merged revisions.

Annotate looks harder, but is actually pretty much the same.  If history
A says the change was introduced by the merge revision, and history B
says the change was introduced earlier, you follow history B.
Representing this to the user may be a challenge, though.  I haven't
figured out how deltas fit in, though.

Sometimes, ancestors need to become ancestors after-the-fact.  For
example, if you merge 5-8, commit, merge 0-5, revision 8 is now an ancestor.

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

iD8DBQFCtu+P0F+nu1YWqI0RAmAdAJ95dlVg9qR2IHlyJ5uwV2I/GgpMXQCgg85n
DRnUd1OTho1BTV3mVtCsMnE=
=HGcY
-----END PGP SIGNATURE-----