[Python-Dev] [Python-checkins] r86703 - python/branches/release31-maint/Lib/idlelib/IOBinding.py

[Terry Reedy]

On 11/23/2010 1:16 AM, Senthil Kumaran wrote:
> Hi Terry,
>
> On Tue, Nov 23, 2010 at 2:07 PM, terry.reedy<python-checkins at python.org>  wrote:
>> Author: terry.reedy
>> Date: Tue Nov 23 07:07:04 2010
>> New Revision: 86703
>>
>> Log:
>> Issue 9222 Fix filetypes for open dialog
>>
>> Modified:
>>    python/branches/release31-maint/Lib/idlelib/IOBinding.py
>
>
> You should be using svnmerge.py script ( referenced in the dev FAQ),
> to merge your changes to release31-maint. This helps in merge tracking
> and helpful to release managers when they do the release.
>
> It is pretty simple, in your release31-maint checkout:
>
> Just run python svnmerge.py merge -r 9221 (your py3k revision value)
> If successful, do a svn commit -F svnmerge-output-filename ( this file
> is autogenerated)

I am using TortoiseSVN which has a similar merge but does not seem to 
autogenerate anything. I did use its merge + commit for the 2.7 backport.

Terry