<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 14 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Wingdings;
panose-1:5 0 0 0 0 0 0 0 0 0;}
@font-face
{font-family:Wingdings;
panose-1:5 0 0 0 0 0 0 0 0 0;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman","serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-GB" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">I haven’t started yet, actually
</span><span style="font-size:11.0pt;font-family:Wingdings;color:#1F497D">J</span><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Probably a first step would be to “pull” the cpython repository, to get the full cpython version in, right?<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">K<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0cm 0cm 0cm 4.0pt">
<div>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span lang="EN-US" style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span lang="EN-US" style="font-size:10.0pt;font-family:"Tahoma","sans-serif""> stackless-bounces@stackless.com [mailto:stackless-bounces@stackless.com]
<b>On Behalf Of </b>Hervé Coatanhay<br>
<b>Sent:</b> 26. júní 2012 09:29<br>
<b>To:</b> The Stackless Python Mailing List<br>
<b>Subject:</b> Re: [Stackless] Stackless 3.3<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Hi all.<o:p></o:p></p>
<div>
<p class="MsoNormal">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.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">If naming is done as usual it gives:<o:p></o:p></p>
<div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif";color:#222222;background:white">hg up -C 3.2-slp</span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">hg branch 3.3-slp<span style="font-size:10.0pt;font-family:"Arial","sans-serif";color:#222222"><br>
<span style="background:white">hg merge 3.3 (this would be 3.3 Maintenance branch from cpython)</span></span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><span style="font-family:"Arial","sans-serif";color:#222222">--> fix conflicts</span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif";color:#222222;background:white">hg commit</span><span style="font-size:10.0pt;font-family:"Arial","sans-serif";color:#222222"><br>
<span style="background:white">hg tag "v3.3.0-slp"</span></span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">Hervé<o:p></o:p></p>
</div>
<div>
<div>
<p class="MsoNormal">On Sun, Jun 24, 2012 at 6:36 AM, Richard Tew <<a href="mailto:richard.m.tew@gmail.com" target="_blank">richard.m.tew@gmail.com</a>> wrote:<o:p></o:p></p>
<div>
<p class="MsoNormal" style="margin-bottom:12.0pt">On Sat, Jun 23, 2012 at 12:04 PM, Richard Tew <<a href="mailto:richard.m.tew@gmail.com">richard.m.tew@gmail.com</a>> wrote:<br>
>> The time approaches when a stackless version 3.3 needs to be prepared.<br>
>><br>
>> Now, what is the right and proper way to do it in this Hg day and age?<br>
>><br>
>><br>
> No idea, even though I've done this! I do recall that the documentation was<br>
> ambiguous and unclear. Please post the process when you work it out :-)<br>
><br>
> I'll look to see if I made notes when I did this, but I am pretty certain I<br>
> didn't.<o:p></o:p></p>
</div>
<p class="MsoNormal">From my notes it looks like the following:<br>
<br>
hg pull [cpython repo url]<br>
<br>
Choose the branch to be merged into and the branch to be merged from.<br>
<br>
hg up [branch to be merged into, may include "-r <revisionid>"]<br>
hg merge [branch to be merged from, may include "-r <revisionid>"]<br>
<br>
Watch mercurial bring in all the changesets from the point of common history.<br>
<br>
hg commit.<br>
hg tag "v3.3.0-slp"<br>
<br>
Be absolutely sure you did it right, and aren't going to push<br>
unremovable changes.<br>
<br>
hg push [stackless repo url]<br>
<br>
It should be that easy. In my case, I got the "into" and "from"<br>
branches backwards to begin with and the merge was messy. After<br>
reversing them, it was pretty straightforward. That wasn't in my<br>
notes, just a vague recollection.<br>
<br>
Anyway, good luck,<br>
Richard.<o:p></o:p></p>
<div>
<div>
<p class="MsoNormal"><br>
_______________________________________________<br>
Stackless mailing list<br>
<a href="mailto:Stackless@stackless.com">Stackless@stackless.com</a><br>
<a href="http://www.stackless.com/mailman/listinfo/stackless" target="_blank">http://www.stackless.com/mailman/listinfo/stackless</a><o:p></o:p></p>
</div>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
</div>
</div>
</div>
</div>
</body>
</html>