On 1/12/07, Guido van Rossum <[EMAIL PROTECTED]> wrote:
AFAIK Thomas just excludes these from the merge,
Indeed I would.
or occasionally (if
they make it through) they will be eradicated in the p3yk branch, and
then they'll be excluded from future merges of related changes (since
those woul
AFAIK Thomas just excludes these from the merge, or occasionally (if
they make it through) they will be eradicated in the p3yk branch, and
then they'll be excluded from future merges of related changes (since
those would be flagged as conflict).
On 1/12/07, Georg Brandl <[EMAIL PROTECTED]> wrote:
Hi,
currently, changes in the trunk are merged to the p3yk branch.
What about changes such as the discussed -3 warn option, or __future__
imports for stuff that'll be in 3k anyway?
Can/should these revisions just be excluded from the merge? Or would
it be better to apply them to a new branch?
Ge
