[Python-Dev] trunk changes not suited for 3.0 (original) (raw)

Thomas Wouters thomas at python.org
Fri Jan 12 16:54:03 CET 2007

On 1/12/07, Guido van Rossum <guido at python.org> 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 would be flagged as conflict).

On 1/12/07, Georg Brandl <g.brandl at gmx.net> 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? > > Georg > _> ________________________ > Python-Dev mailing list > Python-Dev at python.org > http://mail.python.org/mailman/listinfo/python-dev > Unsubscribe: http://mail.python.org/mailman/options/python-dev/guido%40python.org >

-- --Guido van Rossum (home page: http://www.python.org/~guido/)

Python-Dev mailing list Python-Dev at python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/thomas%40python.org

-- Thomas Wouters <thomas at python.org>

Hi! I'm a .signature virus! copy me into your .signature file to help me spread! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.python.org/pipermail/python-dev/attachments/20070112/e0532844/attachment.html

More information about the Python-Dev mailing list