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

Guido van Rossum guido at python.org
Fri Jan 12 16:13:37 CET 2007

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 <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/)

More information about the Python-Dev mailing list