[Python-Dev] Merges from 2.6 to 3.0? (original) (raw)

skip at pobox.com skip at pobox.com
Sat Aug 9 18:37:59 CEST 2008 

Guido> However if you think your change requires any kind of manual help
Guido> to be merged, it's better to do the merge yourself for just that
Guido> revision: svnmerge.py merge -rNNNNN. That way it'll be recorded
Guido> as merged and a later big merge will skip it.

Looks like there's a bit of manual work to do (replacing "try/finally" with "with", for example). I don't know what svnmerge.py is though and don't see it in my svn tools or my trunk sandbox:

~% cd ~/src/python/trunk/
trunk% find . -name svnmerge.py
trunk% like svn
/usr/bin/svn
/usr/bin/svnadmin
/usr/bin/svndumpfilter
/usr/bin/svnlook
/usr/bin/svnserve
/usr/bin/svnsync
/usr/bin/svnversion

Skip

More information about the Python-Dev mailing list