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
