[MERGE] Annotation updates

[John Arbash Meinel]

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

Robert Collins wrote:
> Robert Collins has voted tweak.
> Status is now: Conditionally approved
> Comment:
> I don't know that line introduced by two branches should be assigned to
> the merge; perhaps it should be assigned to both branches? That is, why
> do we say line->revision rather than line->[revisions] ?

That would probably be a very interesting thing to do. At the moment,
though, we can't represent that without some large changes to our
annotation processing. Certainly it would allows us to get rid of heads
checking (you can just see if you are in the list, and if not, add
yourself, or something along those lines.)


> 
> I really don't like meaningless variables. Please give them proper
> names, or at least a comment saying what they are.

Done. A bit of restructuring and a lot of renaming.

> 
> docstring in your frozenheadscache is wrong ( it claims to preserve the
> api)
> 

Thanks for the catch. Just a copy&paste error.

John
=:->

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

iD8DBQFH2mfbJdeBCYSNAAMRAqB9AJwK2+ESQP1EFwKMrXBoMyUM6gO6qgCfZdcf
isZw6F6qFfHTPXzgAdrzIr8=
=7yTN
-----END PGP SIGNATURE-----