That's sorted it. Thanks. On 3/1/14, Kristján Valur Jónsson <[email protected]> wrote: > You should ask Anselm, but what I think was done was that the changes were > recreated with the correct line changes, and the old branches stripped. If > you pull from the repo, you will find that you now have two heads for 2.7. > One of them is the old discarded one, and it will probably contain local > changes from you. You will then want to graft those changes onto the new > head, and strip the old invalid branch :) > I think. > First thing to do is to pull the repo (into a local clone) and see what the > result looks like and what a "hg outgoing" reports. > I think. > > K > > -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of Richard Tew > Sent: 28. febrúar 2014 18:55 > To: The Stackless Python Mailing List > Subject: Re: [Stackless] new releases? > > There were commits in the repo with invalid line endings. These were > removed in some way. Does my pulling remove these changes from my local > repo, or are these changes a part of my local repo which can only be > discarded by doing a fresh clone, and will be pushed as part of a push > otherwise? > > On 2/28/14, Kristján Valur Jónsson <[email protected]> wrote: >> Not sure I understand your question. If it has no local changes, why >> would it need pushing? >> If it has, then I really can't tell what those changes are :) You can >> always to a "hg outgoing" command to detect what would be pushed. >> >> Or are you questioning whether we should release those new stackless >> thingies with all those new changes? That's another issue entirely :) >> All of these changes have been benign, and all pass the unittests. >> The only exception is the set of changes originating at >> 20dad21ded9c548c256781f480df7ebe94a7f256 >> tasklet initialization was moved from __new__ to __init__ making >> tasklet subclassing more straightforward. >> This may impact code that creates custom tasklet subclasses. >> The benefit is that now you can write >> class foo(tasklet): >> def __init__(self, func, myarg): >> super(foo, self).__init__(func) >> self.myarg = myarg >> >> instead of the weird and awkward: >> def __init__(self, func, myarg): >> self.myarg = myarg >> def __new__(kls, func, myarg): >> return tasklet.__new__(kls, func) >> >> The change is that: >> 1) __init__ works just like bind() >> 2) __new__ ignores extra arguments (like all other news for builtin >> types) >> >> K >> >>> -----Original Message----- >>> From: [email protected] [mailto:stackless- >>> [email protected]] On Behalf Of Richard Tew >>> Sent: 27. febrúar 2014 20:20 >>> To: The Stackless Python Mailing List >>> Subject: Re: [Stackless] new releases? >>> >>> Is it safe to push given the new line work done? >>> >>> My local clone has no custom changes, but orginated from before the >>> new line fixes. I've since pulled the latest from the repo, is this >>> enough to make my clone safe to push back? >>> >>> Cheers, >>> Richard. >>> >>> On 2/24/14, Kristján Valur Jónsson <[email protected]> wrote: >>> > I am relatively sure that all stackless changes have been merged >>> > between the branches. >>> > I did a perfunctory diff of the 2.7-slp and 3.2-slp folders, >>> > particularly the unittests, and it seems everything that has tests >>> > is >>> accounted for. >>> > >>> > 3.3-slp follows automatically from that since it is a merge from >>> > 3.2-slp >>> > >>> > Are you perhaps speaking of merges from the corresponding cPython >>> branches? >>> > We can do that, but we then have to be careful about the revisions >>> > we pick for release. >>> > >>> > As for 3.4, there is no 3.4-slp branch in the repo. I did one such >>> > branch once, but I forget where it ended up. I understand there is >>> > another somewhere floating around. but it certainly isn't part of >>> > the bitbucket repo, unless I'm missing something obvious. >>> > >>> > K >>> > >>> >> -----Original Message----- >>> >> From: [email protected] [mailto:stackless- >>> >> [email protected]] On Behalf Of Richard Tew >>> >> Sent: 23. febrúar 2014 20:40 >>> >> To: The Stackless Python Mailing List >>> >> Subject: Re: [Stackless] new releases? >>> >> >>> >> I'll prepare the 2.7.6 release, and all inbetween up to 3.3.4. If >>> >> no-one has updated 3.4 after that, I'll prepare a release for that. >>> >> >>> >> But if you want to ensure all merges are present, before I get >>> >> around to that, it would be appreciated. >>> > >>> > >>> > _______________________________________________ >>> > 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 >> > > _______________________________________________ > 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
