Thomas Wouters schrieb: > On 9/27/07, Eric Smith <[EMAIL PROTECTED]> wrote: >> >> Thomas Wouters wrote: >> >> > Unfortunately, that's not how it works :-) If you check something into >> > the trunk, it will be merged into Py3k sooner or later. I may ask the >> > original submitter for assistance if it's incredibly hard to figure out >> > the changes, but so far, I only had to do that with the SSL changes. The >> > decimal changes are being merged as I write this (tests running now.) Is >> > there anything in particular that needs to be done for decimal in Py3k, >> > besides renaming __div__ to __truediv__? >> > >> > If you re-eally need to check something into the trunk that re-eally >> > must not be merged into py3k, but you're afraid it's not going to be >> > obvious to the merger, please record the change as 'merged' using >> > "svnmerge merge -M -r<revision>". Please take care when picking the >> > revision ;) You can also just email me or someone else you see doing >> > merges, as I doubt this will be a common occurance.
I think that the 'svnmerge block -r<revision>' command should be used. Or not? Thomas _______________________________________________ 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
