On Sat, Aug 9, 2008 at 9:37 AM, <[EMAIL PROTECTED]> wrote: > > 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: >
As always, the dev FAQ has the answer you are looking for: http://python.org/dev/faq/#how-do-i-merge-between-branches . _______________________________________________ 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
