So, funny thing today... Here I am, getting ready to argue this:
On Sun, Jan 30, 2011 at 8:12 AM, Christoph Zwerschke <[email protected]> wrote: > I suggest to merge this 2.0 branch back in the main 2.1 repository. To do > that, pull the 50 changesets of the 2.0 repository (e.g. as bundle), and > merge the first pulled in changeset with whatever appears to be the closest > revision in the main repository (786 or so). I was getting ready to say it's difficult, pain in the ass, impossible to do, no common base, take your pick. And then I figured I'd best be able to prove that I had tried it. Well, I've been proven wrong. It's possible, and it's even done. I've got the work set up on Sourceforge right now. Thing is that I'm not sure it's exactly what we want, since I'm still a bit new with git. Anybody who can, please devote some time to checking out https://sourceforge.net/p/pylonsproject/tg2/home/ (you'll see the three code repositories listed there), and make sure that things look the way you would expect them to? I know that I'm able to git clone, and get the tags and the branches and the code. Things look right to me. But maybe someone with more git knowledge could speak up? Would be most appreciated. > Btw, which tool do you use to convert from hg to git? https://bitbucket.org/abderrahim/hg-git/ Documentation is a bit sparse, but it does work. > Btw, we also need to decide where to host our packages. On the old server, > we had http://files.turbogears.org and http://pypi.turbogears.org, and they > were maintained independently. We should find a replacement for these and > consolidate them. I'm not 100% convinced of the value of them. One of the discussions that's come up recently has mentioned the use of setup.py and setup.cfg to coerce our version numbers. Since we can do that, and therefore get a consistent (reproducible!) installation, maybe we should look at (eventually) abandoning these tools entirely. I'm not sure, and I'm not going to hand down edicts on this point. There may well be valid reasons to keep something like these two tools that I don't know about. I'd lovee to hear feedback/reasons to keep either one or both around. -- Michael J. Pedersen My IM IDs: Jabber/[email protected], ICQ/103345809, AIM/pedermj022171 Yahoo/pedermj2002, MSN/[email protected] -- You received this message because you are subscribed to the Google Groups "TurboGears Trunk" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/turbogears-trunk?hl=en.
