On Mar 18, 2012, at 12:03 AM, Georg Brandl wrote:

>I'm afraid it's the latter: tags are entries in .hgtags. So when you
>completely null-merge your 2.6 changes into 2.7, you are basically removing
>the tag from the 2.7 branch.  And since to find tags, Mercurial looks in the
>.hgtags files of all active branch heads, you are basically hiding the tag
>when you merge 2.6 into 2.7, at which point it becomes an inactive branch
>head.

D'oh.  Okay, so leave the .hgtags file alone when null merging 2.6->2.7.

Actually, that probably applies to all forward merges, so I think this would
be useful information for either the devguide or PEP 101, or both.  I updated
the latter right at the --tag step.

Thanks,
-Barry
_______________________________________________
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

Reply via email to