Hi Terry, On Tue, Nov 23, 2010 at 2:07 PM, terry.reedy <python-check...@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) If any conflicts occur, resolve them and then do the step 2. Thanks, Senthil _______________________________________________ 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
