AFAIK, it's exactly how you described - Richard cloned the python repo and applied the stackless patches on top of it.
For Hg tips&tricks, I highly recommend reading http://hginit.com - it's just awesome read and helped me understand few Hg quirks :) -alex 2012/1/3 Kristján Valur Jónsson <[email protected]>: > So Richard, whatever came out of this? > Also, can you give me a brief overview on how the repository is laid out? > From my quick overview, it appears to be a clone of the python repository, > with stackless 2.7 and 3.2 branches created by branching off the original > ones (non stackless), applyling the stackless delta and checking in as new > branches. > So, do things work now? > I just upgraded to the latest tortoiseHg client, synced the repo and so on. > Any tips and tricks? I'm still not very familiar with the hg world. > K > >> -----Original Message----- >> From: [email protected] [mailto:stackless- >> [email protected]] On Behalf Of Richard Tew >> Sent: 27. september 2011 23:43 >> To: The Stackless Python Mailing List >> Subject: Re: [Stackless] Stackless mercurial repository live >> >> 2011/9/27 Kristján Valur Jónsson <[email protected]>: >> > Ok, I'll do that. So, what's the current dev policy for the new repo? >> > Where does continuing work go to? >> >> Note that it's probably best to hold off. >> >> I'm experiencing problems with using the native facilities merging between >> the cpython repository and the stackless repository, because they do not >> share a common history. >> >> We can't pull from the former to the latter (or I am doing it wrong). >> >> hg pull --force ..\cpython --branch 3.2 --rev a222a015e28d:ac1f7e5c0510 >> abort: unknown revision 'a222a015e28d:ac1f7e5c0510'! >> >> The unknown revision is probably a user error on my part, although this is >> how the docs say to do revision ranges. The docs also say that this will not >> work without a common history, and that cherry picking revisions in general >> is unsupported. >> >> We can't "transplant" from the former to the latter (or I am doing it wrong). >> >> D:\VCS\HG\Python\stackless-r32>hg transplant --source ..\cpython >> --branch 3.2 --merge ac1f7e5c0510 >> searching for changes >> warning: repository is unrelated >> searching for changes >> abort: repository is unrelated >> >> I think the best option is to redo the conversion, but rather than into an >> empty new repository, instead into a clone of the cpython repository and >> then to look at converting the stackless SVN repository into that again and >> if >> it is possible to get linkages in place. >> >> Baaaaaaaaaaaaaaaaaahhhhh humbug! >> >> Cheers, >> 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 -- a lex 13 x http://a13x.net | @a13xnet _______________________________________________ Stackless mailing list [email protected] http://www.stackless.com/mailman/listinfo/stackless
