Re: [Python-Dev] Long term development external named branches and periodic merges from python

2011-11-27 Thread Nick Coghlan
On Mon, Nov 28, 2011 at 2:21 PM, Jesus Cea wrote: > Since "create patch" (in the tracker) doesn't compare against the tip > of mainline (at least not in a trivial way), I guess it is comparing > against the BASE of the branch. That is ok... as far as I don't merge > changes from mainline to the br

Re: [Python-Dev] Long term development external named branches and periodic merges from python

2011-11-27 Thread Jesus Cea
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 26/11/11 17:30, Éric Araujo wrote: >> That is what I want to do, but I need to know that it is safe to >> do so (from the "Create Patch" perspective). > I don’t understand “safe”. "Safe", in this context, means "when clicking 'create patch' the cre

Re: [Python-Dev] Merging 3.2 to 3.3 is messy because "Misc/NEWS"

2011-11-27 Thread Petri Lehtinen
Jesus Cea wrote: > On 12/11/11 16:56, Éric Araujo wrote: > > Ezio and I chatted a bit about his on IRC and he may try to write > > a Python parser for Misc/NEWS in order to write a fully automated > > merge tool. > > Anything new in this front? :-) I don't see what's the problem really. The most