From: Shane Z. <sh...@lo...> - 2009-09-23 03:30:28
|
On Sep 22, 2009, at 12:46 AM, Marc G. Fournier wrote: > On Mon, 21 Sep 2009, Chris Nandor wrote: > >> On Sep 21, 2009, at 19:35, Marc G. Fournier wrote: >> >>> You made a mention about having a script that would push up the >>> newest >>> code of slashdot *minus* the slashdot theme, to the git >>> repository ... the >>> impression I got was that was pretty much waiting for the move of >>> the git >>> repository to sourceforge ... >>> >>> If I'm understanding correctly, then at that point, the divergency >>> in code >>> between slashdot and what is in the git repository, will be once >>> more >>> eliminated ... >> >> >> There's no real divergency in the code. There's a few templates >> that don't >> have the functionality the Slashdot templates have, esp. for >> FireHose. Which >> is dumb of us, and eventually we can rectify that. But there's no >> divergency, it's just not pushing up code we don't want public, >> which is more >> complicated in git than in CVS. > > Ah, even better then ... then it sounds like more the issue is release > management for the code (that you guys don't have time for) then any > code > issues ... No. Think of it this way. They have their master repo of the code. In it they have their 'Slashdot' Theme (in themes/slashdot). They don't want that public. They may have plugins, or even other patches to some of the base code, that they don't, can't (for whatever reason) to be made public. So it sounds like once they get it nailed down on how to exclude that from their master git repo, then they can have the publicly available git repo on their SF homepage pull from their master but exclude whatever they need to be private. We did the same thing with our own CVS repo of Slashcode. We would just pull update from their public, and push patch into our own repo. Chris, I would be curious how you guys figure out how to do this, if you can make it public and have the time to try to explain :) Shane |