If the differences are few, I prefer that you insert some conditionals
that attach different functions based on the version number. That way
we can keep a single version of the source that works on all of the
pythons.
Raymond
On Sep 29, 2007, at 8:26 AM, "Thomas Wouters" <[EMAIL PROTECTED]> wrote:
On 9/28/07, Thomas Heller <[EMAIL PROTECTED]> wrote:
Thomas Wouters schrieb:
>> > 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?
If you're comfortable with using svnmerge yourself, sure. If you're
worried that you might mess up the state of the branch, you can
leave it up to us (me.)
--
Thomas Wouters <[EMAIL PROTECTED]>
Hi! I'm a .signature virus! copy me into your .signature file to
help me spread!
_______________________________________________
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/python%40rcn.com
_______________________________________________
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
