[Tim] >>> ... >>> Here's what I intend to do (unless an objection appears): >>> >>> hg up 3.3 >>> hg merge 3.2 >>> # merge in the v3.2.5 tag definition from .hgtags, >>> # but revert everything else >>> hg revert -a -X .hgtags -r . >>> hg resolve -a -m >>> hg diff # to ensure that only the v3.2.5 tag in .hgtags changed >>> hg commit
[R. David Murray] >> You'll need a push here, too. And at that point it may fail. It may be >> the case that only Georg can push to 3.2, I don't remember for sure. [Terry Reedy] > Where is the push to 3.2? I only see changes to 3.3 (to be repeated with > 3.4). Hi, Terry - long time no type :-) Merging 3.2 into 3.3 does make the original 3.2 head a parent of the merge changeset - I don't know whether whatever restrictions are in place would prevent that. I'd sure be _surprised_ if it prevented it, though ;-) _______________________________________________ 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
