[Stackless] switching improvements
Kristján Valur Jónsson
kristjan at ccpgames.com
Sat Jan 12 08:18:12 CET 2013
Hi, thanks for taking the time to review this.
What I did was to look at the original diff on bitbucket and reapply it in many steps, also re-doing some of the things. It wasn't that hard, really. I use "beyond compare" locally which is great for both merging and diffing.
To port between branches, I use the 'transplant' extension to Mercurial.
I wish we could set up our SLP branches so that we could simply use HG merge. Perhaps that is possible.... If this were Perforce, I would perform a merge and "keep target" for all files. This would set up the merge state between the branches correctly. I think we can do the same for HG, but I'm not really a Hg expert.
I'll take your comment as approval, then. I'll merge the changes over to the other branches and update the official repo at hg.python.org/stackless.
Cheers from Shanghai,
From: Christian Tismer [mailto:tismer at stackless.com]
Sent: Friday, January 11, 2013 0:43
To: Kristján Valur Jónsson
Cc: The Stackless Python Mailing List
Subject: Re: SV: [Stackless] switching improvements
On 1/5/13 5:04 PM, Kristján Valur Jónsson wrote:
> There is a new repo,
> I've split the changes into a bunch of smaller incremental ones.
> I also found a problem with tasklet.raise_exception which I fixed. I'm working on checking if it works at all for 3.2 and 2.7, and am installing 2008 on my workstation from remote to be able to test those platforms.
I finally found some time to review you new patch set thoroughly.
And I have to say that this is an extremely nice patch, fun to read the comments and follow all the steps.
Also I appreciate the newly added tests, not to forget the bomb fix.
The API is cleaner, the macros are real statements, all in all a great enhancement.
Out of curiosity, how did you split your big path into many?
It looks like a lot of work, but it made sense, because it is a logically consistent story to read.
Did you work with two repos and copied hunks with a diff tool?
Actually life is easier with github, it has more options to stash changes, merge changes, staging them etc.
But I'm working with bitbucket as well. Works not that bad with "sourcetree".
How do you now apply the diff to all the versions? Again taking checkin by checkin and running the test, maybe, or is there a simpler way?
Hope that this goes into Stackless ASAP. Can I help with something?
cheers - Chris
Christian Tismer :^) <mailto:tismer at stackless.com>
Software Consulting : Have a break! Take a ride on Python's
Karl-Liebknecht-Str. 121 : *Starship* http://starship.python.net/
14482 Potsdam : PGP key -> http://pgp.uni-mainz.de
phone +49 173 24 18 776 fax +49 (30) 700143-0023
PGP 0x57F3BF04 9064 F4E1 D754 C2FF 1619 305B C09C 5A3B 57F3 BF04
whom do you want to sponsor today? http://www.stackless.com/
More information about the Stackless