Re: [Flightgear-devel] fgdata is frozen!
On Sun, 16 Oct 2011, ThorstenB wrote: > 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. git can deal with branches containing completely separate histories so git will most likely be less confused than the operator.. :) If you choose to keep both the old branch of fgdata and the new in the same repository (I plan to do this) you do need to be careful not to mix them up - hence only attempt that if you are comfortable with how git works git. If you have local changes that you want to migrate you can do that with git cherry-pick or by exporting them as a sequence of patches and importing those in the new branch (or repository). The latter is probably preferable, but I have not used those commands so I can't give examples. Another useful "hack" is that you can turn your modified aircraft directory (or a copy of it) into a git work directory for the new git repository for that aircraft by cloning said repository and then copying the .git directory from it into into the directory of the locally modified aircraft. Then you can use the standard git diff etc commands to see exactly what your local modifications are and produce diffs or commit them locally to create a merge request for the upstream repository. This approach worked beautifully when I had to recover all my local changes from my fgdata CVS work directory when our CVS server died. Cheers, Anders -- --- Anders Gidenstam WWW: http://www.gidenstam.org/FlightGear/ -- 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
Re: [Flightgear-devel] fgdata is frozen!
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
Re: [Flightgear-devel] fgdata is frozen!
I guess that the aircrafts will just end up "deleted" in the next pull, leaving the rest of FGDATA untouched. However, FGFS already supports a different path for aircrafts, so it should be pretty simple to get everything running as usual. Just copy the planes to another folder before the next pull. The medicine might be slightly bitter, but you will feel a lot better after it, methinks. Ciao (because I can), Alessandro From: curtol...@gmail.com Date: Sun, 16 Oct 2011 16:30:11 -0500 To: flightgear-devel@lists.sourceforge.net Subject: Re: [Flightgear-devel] fgdata is frozen! Hi Thorsten, 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? Thanks, Curt. On Sun, Oct 16, 2011 at 2:31 PM, ThorstenB wrote: Jorg and Gijs are working on the new fgdata repo now. Therefore the existing fgdata repo is frozen as of now - even commit privileges are removed - hopefully permanently for the (historic) fgdata repo. They'll start a new (temporary) repository. Once the new repo is all setup and working as expected, we'll switch (shuffle the names) and add committers. 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 -- Curtis Olson:http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://gallinazo.flightgear.org -- 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 -- 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
Re: [Flightgear-devel] fgdata is frozen!
Hi Thorsten, 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? Thanks, Curt. On Sun, Oct 16, 2011 at 2:31 PM, ThorstenB wrote: > Jorg and Gijs are working on the new fgdata repo now. > Therefore the existing fgdata repo is frozen as of now - even commit > privileges are removed - hopefully permanently for the (historic) fgdata > repo. > > They'll start a new (temporary) repository. Once the new repo is all > setup and working as expected, we'll switch (shuffle the names) and add > committers. > > 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 > -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://gallinazo.flightgear.org -- 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
[Flightgear-devel] fgdata is frozen!
Jorg and Gijs are working on the new fgdata repo now. Therefore the existing fgdata repo is frozen as of now - even commit privileges are removed - hopefully permanently for the (historic) fgdata repo. They'll start a new (temporary) repository. Once the new repo is all setup and working as expected, we'll switch (shuffle the names) and add committers. 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
