Am 16.10.2011 23:30, schrieb Curtis Olson: > One question: if we have our own local branches of the fgdata repository > for our own experimentation, will it be straightforward to hang these > off the new repository?
Simple answer: no. :-( Since we really want to reduce the repository size - that means reduce the "git archive" - we need to write a new repository. The change won't just be a normal (= "forward") commit which removes aircraft. Instead, it's basically a completely new repository. We'll just give it the same name - but all these magic git commit identifiers (hashes) will have changed - even for the very earliest commits in our history. git will be extremely confused when we switch fgdata and you try to work with your existing repo. You can't just pull the new data into your existing repo, or expect your current local branches to match. Neither can you simply "git merge" old branches to the new repo, or push old branches to the new repo. You'll probably get funny "non-fast forward" errors and huge truck loads of "merge conflicts". It's probably best to leave existing local fgdata repositories as they are, maybe rename and retain the directories - and start with a completely new repository. And if there's anything in your local repo you want to keep, then create a new branch in the new repo and manually move the stuff and recreate your local branch. At least that's the best that I know of. But maybe some else has a magic solution... But before we switch, we should really test the new repo and verify everything is ok. And we certainly need a short description of how exactly the new repo works - how we update/pull the aircraft etc. I'd expect all this to take a day or two. But let's see how Jorg and Gijs are getting a long - and keep your thumbs pressed. cheers, Thorsten ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity and more. Splunk takes this data and makes sense of it. Business sense. IT sense. Common sense. http://p.sf.net/sfu/splunk-d2d-oct _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
