Yes pull cpython is the first step as stated in Richard email. Anyway I think we should wait the creation of the "3.3" branch in cpython repo too. I suppose we want to apply stackless changes on 3.3 branch right ?
Hervé On Tue, Jun 26, 2012 at 12:10 PM, Kristján Valur Jónsson < [email protected]> wrote: > I haven’t started yet, actually J**** > > Probably a first step would be to “pull” the cpython repository, to get > the full cpython version in, right?**** > > K**** > > ** ** > > *From:* [email protected] [mailto: > [email protected]] *On Behalf Of *Hervé Coatanhay > *Sent:* 26. júní 2012 09:29 > *To:* The Stackless Python Mailing List > *Subject:* Re: [Stackless] Stackless 3.3**** > > ** ** > > Hi all.**** > > Kristjan, I don't know if you are done with the merge. But as I gave a try > to what said Richard, I think a 3.3-slp branch should be created after > update and before merge.**** > > ** ** > > If naming is done as usual it gives:**** > > ** ** > > hg up -C 3.2-slp**** > > hg branch 3.3-slp > hg merge 3.3 (this would be 3.3 Maintenance branch from cpython)**** > > --> fix conflicts**** > > hg commit > hg tag "v3.3.0-slp"**** > > ** ** > > Hervé**** > > On Sun, Jun 24, 2012 at 6:36 AM, Richard Tew <[email protected]> > wrote:**** > > On Sat, Jun 23, 2012 at 12:04 PM, Richard Tew <[email protected]> > wrote: > >> The time approaches when a stackless version 3.3 needs to be prepared. > >> > >> Now, what is the right and proper way to do it in this Hg day and age? > >> > >> > > No idea, even though I've done this! I do recall that the documentation > was > > ambiguous and unclear. Please post the process when you work it out :-) > > > > I'll look to see if I made notes when I did this, but I am pretty > certain I > > didn't.**** > > From my notes it looks like the following: > > hg pull [cpython repo url] > > Choose the branch to be merged into and the branch to be merged from. > > hg up [branch to be merged into, may include "-r <revisionid>"] > hg merge [branch to be merged from, may include "-r <revisionid>"] > > Watch mercurial bring in all the changesets from the point of common > history. > > hg commit. > hg tag "v3.3.0-slp" > > Be absolutely sure you did it right, and aren't going to push > unremovable changes. > > hg push [stackless repo url] > > It should be that easy. In my case, I got the "into" and "from" > branches backwards to begin with and the merge was messy. After > reversing them, it was pretty straightforward. That wasn't in my > notes, just a vague recollection. > > Anyway, good luck, > Richard.**** > > > _______________________________________________ > Stackless mailing list > [email protected] > http://www.stackless.com/mailman/listinfo/stackless**** > > ** ** > > _______________________________________________ > Stackless mailing list > [email protected] > http://www.stackless.com/mailman/listinfo/stackless >
_______________________________________________ Stackless mailing list [email protected] http://www.stackless.com/mailman/listinfo/stackless
