Message 78487 - Python tracker

➜

This issue tracker has been migrated to GitHub , and is currently read-only.
For more information, see the GitHub FAQs in the Python's Developer Guide.

In-reply-to
Author	tarek
Recipients	amaury.forgeotdarc, tarek
Date	2008年12月29日.21:44:47
SpamBayes Score	1.7986965e-08
Marked as misclassified	No
Message-id	<1230587089.12.0.891266818622.issue4400@psf.upfronthosting.co.za>

Content
I am not sure what is the best way to merge it from 3k branch to release30-maint since the original change was done with an automatic merge from trunk to 3k branch with several other changes, then a slight fix so the 2.x code works under 3.x. Should I do a manual merge in release30-maint or there's a special way to handle it ?

Content

I am not sure what is the best way to merge it from 3k branch to
release30-maint since the original change was done with an automatic
merge from trunk to 3k branch with several other changes, then a slight
fix so the 2.x code works under 3.x.
Should I do a manual merge in release30-maint or there's a special way
to handle it ?

History
Date	User	Action	Args
2008年12月29日 21:44:49	tarek	set	recipients: + tarek, amaury.forgeotdarc
2008年12月29日 21:44:49	tarek	set	messageid: <1230587089.12.0.891266818622.issue4400@psf.upfronthosting.co.za>
2008年12月29日 21:44:48	tarek	link	issue4400 messages
2008年12月29日 21:44:47	tarek	create

homepage