[Python-checkins] cpython (2.6): Added tag v2.6.8rc2 for changeset bd9e1a02e3e3

[Georg Brandl]

On 03/18/2012 05:13 AM, Barry Warsaw wrote:
> On Mar 17, 2012, at 07:15 PM, Éric Araujo wrote:
> 
>>Note that duplicate entries in .hgtags (when a tag was redone) should
>>not be “cleaned up”: the presence of the old changeset hash greatly
>>helps conflict resolution.  (If someone pulled the repo with the old tag
>>and later pulls and updates, then they don’t have to find out which hash
>>is the right tag, they just accept all changes from the updated file
>>into their local file.)
> 
> But if someone wants to grab the 2.6.8rc2 tag, which changeset do they get?  I
> guess the last one... maybe?

Yes, the last entry in .hgtags counts.  I would recommend to clean up the file
though.

>>This problem in the future can be avoided by merging all changesets from
>>X.Y to X.Y+1, not null-merging, unless I misunderstand something.

Well, null-merging is nothing but merging all changesets, but then reverting
everything.  You just have to be careful not to revert .hgtags.

Georg