> I would also like to see it work with both the plib and osg branches
> of flightgear. It may come as a surprise to some, but git-cvsimport
> does not get this right. Tailor does a fine job, however.
I used tailor for the same reason. It took me many many many many
tries to get tailor's config right as well.
> i.e. what is the difference between cvs.osg and osg?
cvs.osg and cvs.plib are straight mirror of FG/SG cvs by tailor,
where I keep it clean and untouched.
osg and plib would be the same, plus anything that might be added
and only necessary to git. e.g. .gitignore files, or anything else that
I have to manually fix up with the git repo (e.g. see below).
osg is the default HEAD branch.
It might not be the best way, but somehow I decided to set it up
like that. Comments are welcomed. :)
> With pigeon's permission, I propose that we rebase our personal
> branches on the appropriate branches of his repositories (simgear.git,
> flightgear.source.git, flightgear.data.git).
I'm happy for people to use my git repo. One thing I'd like to note
though is, I found a bug with tailor (reported at
http://progetti.arstecnica.it/tailor/ticket/133), whereby files that are
removed in the CVS repo are not removed in git. I have manually removed
(most of) those myself (branch osg and plib), but there might be some
left. Hopefully this isn't a huge problem.
Pigeon.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Flightgear-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
