From: Hans F. <fu...@gm...> - 2007-07-23 16:49:12
|
Hello pigeon, John, and other git users. Everyone else can go about their business, this is not a "convert to git" speech. We have a problem. One of the big advantages to a distributed revision control system, whether it be git or something else, is that we can all work on our own branch(es) and pull from eachother's branches. However, this ability is highly stifled by the current landscape, where each of us is maintaining his own git (or whatever - I've been using mercurial) mirror/gateway to CVS. The only way to bring changes from John Denker's "sport" branch into one of these other mirrors (as one concrete example) is to manually cherry pick the patches. This is not only error-prone, but a huge waste of disk space when we begin having 3, 4, or more repositories, working copies, etc. of the data branch. I have a proposal. We need a common repository on which to base our branches so that we can do meaningful collaboration. It needs to be simply a gateway from CVS, and should be reasonably up-to-date. It doesn't need to have (and probably shouldn't) any of our personal development branches, but should stand alone as the canonical CVS-to-git gateway. Then we will have the commonality that will make distributed collaboration possible. 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. Pigeon, I think you have a repository that meets those requirements, though I admit being somewhat confused by the branch naming: $ git branch -r origin/HEAD origin/cvs.osg origin/cvs.plib origin/osg origin/osg.pigeon origin/plib origin/plib.pigeon i.e. what is the difference between cvs.osg and osg? 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). Hans |
From: Michael S. <scr...@ya...> - 2011-09-27 09:00:52
|
HiI've messed up weather in fgdata. How could i discard local changes and only get changes/original files? Git says to be up to date but weather is broken.Later I'll do my first upload. (groundnetworks.xml etc.) I do alike the wiki and after commit simply do a git push?Thanks Michael |
From: Curtis O. <cur...@gm...> - 2011-09-27 15:26:27
|
On Tue, Sep 27, 2011 at 4:00 AM, Michael Sgier wrote: > Hi > > I've messed up weather in fgdata. How could i discard local changes and > only get changes/original files? Git says to be up to date but weather is > broken. > > Later I'll do my first upload. (groundnetworks.xml etc.) I do alike the > wiki and after commit simply do a git push? > Hi Michael, If you know the specific file(s) that need to be returned to official git head version, then just run: git checkout file1 file2 file3 ... That (unceremoniously and without any confirmation) will discard your local changes to those named files. Curt. -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://gallinazo.flightgear.org |
From: TDO_Brandano - <tdo...@ho...> - 2011-09-27 15:33:38
|
if you just want to discard EVERYTHING back to the head version (make sure you are on the master branch) try this: git checkout -- . the full stop is part of the command, btw Alessandro. From: cur...@gm... Date: Tue, 27 Sep 2011 10:25:56 -0500 To: fli...@li... Subject: Re: [Flightgear-devel] git On Tue, Sep 27, 2011 at 4:00 AM, Michael Sgier wrote: HiI've messed up weather in fgdata. How could i discard local changes and only get changes/original files? Git says to be up to date but weather is broken. Later I'll do my first upload. (groundnetworks.xml etc.) I do alike the wiki and after commit simply do a git push? Hi Michael, If you know the specific file(s) that need to be returned to official git head version, then just run: git checkout file1 file2 file3 ... That (unceremoniously and without any confirmation) will discard your local changes to those named files. Curt.-- 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-d2dcopy1 _______________________________________________ Flightgear-devel mailing list Fli...@li... https://lists.sourceforge.net/lists/listinfo/flightgear-devel |
From: Michael S. <scr...@ya...> - 2011-09-28 12:57:18
|
Weather is still broken... Ok now I try my first upload and get:----------michael@ubuntu:/media/DATA/FGFS/install/fgfs/fgdata$ git commit --amend --author='Michael Sgier <scr...@ya...>' [master 8a14694] Michael Sgier first git uploads Author: Michael Sgier <scr...@ya...> Committer: michael <michael@ubuntu.(none)> Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly: git config --global user.name "Your Name" git config --global user.email yo...@ex... If the identity used for this commit is wrong, you can fix it with: git commit --amend --author='Your Name <yo...@ex...>' 11 files changed, 874 insertions(+), 0 deletions(-) create mode 100644 Input/Joysticks/CH/pro-yoke-usb-zoomKeys.xml create mode 100644 Scenery/Airports/L/S/G/LSGS.groundnet.xml create mode 100644 Scenery/Airports/L/S/G/LSGS.twr.xml create mode 100644 Scenery/Airports/L/S/M/LSMP.groundnet.xml create mode 100644 Scenery/Airports/L/S/M/LSMP.twr.xml create mode 100644 Scenery/Airports/L/S/Z/LSZB.groundnet.xml create mode 100644 Scenery/Airports/L/S/Z/LSZB.twr.xml create mode 100644 Scenery/Airports/L/S/Z/LSZC.groundnet.xml create mode 100644 Scenery/Airports/L/S/Z/LSZC.twr.xml create mode 100644 Scenery/Airports/L/S/Z/LSZS.groundnet.xml create mode 100644 Scenery/Airports/L/S/Z/LSZS.twr.xml michael@ubuntu:/media/DATA/FGFS/install/fgfs/fgdata$ git push origin master fatal: The remote end hung up unexpectedly michael@ubuntu:/media/DATA/FGFS/install/fgfs/fgdata$ git push fatal: The remote end hung up unexpectedly michael@ubuntu:/media/DATA/FGFS/install/fgfs/fgdata$ Am I doing something wrong or do I need permissions etc.? Cheers Michael --- On Tue, 9/27/11, Curtis Olson <cur...@gm...> wrote: From: Curtis Olson <cur...@gm...> Subject: Re: [Flightgear-devel] git To: "FlightGear developers discussions" <fli...@li...> Date: Tuesday, September 27, 2011, 5:25 PM On Tue, Sep 27, 2011 at 4:00 AM, Michael Sgier wrote: HiI've messed up weather in fgdata. How could i discard local changes and only get changes/original files? Git says to be up to date but weather is broken. Later I'll do my first upload. (groundnetworks.xml etc.) I do alike the wiki and after commit simply do a git push? Hi Michael, If you know the specific file(s) that need to be returned to official git head version, then just run: git checkout file1 file2 file3 ... That (unceremoniously and without any confirmation) will discard your local changes to those named files. Curt.-- Curtis Olson:http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://gallinazo.flightgear.org -----Inline Attachment Follows----- ------------------------------------------------------------------------------ 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-d2dcopy1 -----Inline Attachment Follows----- _______________________________________________ Flightgear-devel mailing list Fli...@li... https://lists.sourceforge.net/lists/listinfo/flightgear-devel |
From: ThorstenB <br...@gm...> - 2011-09-28 17:31:37
|
On 28.09.2011 14:57, Michael Sgier wrote: > Am I doing something wrong or do I need permissions etc.? Did you create an account on gitorious.org and add your SSH key? Next step then is to create a personal fgdata clone with your gitorious account. The idea is to push your personal changes to your own clone, and then place a merge request to fg/fgdata. You can't push updates directly to fg/fgdata (at least not unless you've been using and got accustomed to git + gitorious for a while - and are a regular fgdata contributor). cheers, Thorsten |
From: Michael S. <scr...@ya...> - 2011-09-29 06:45:00
|
Thorsten: I had an account and created a ssh key. Now it has a red cross below ready in gitorious. Something wrong with that? Now the fgdata clone should be on my pc alike the fgfs wiki or where? How to push or put a merge request?? Durk: I've only seen some lone hangars with terrasync but no probably not all as they are for 850 format. As HB-GRAL stated some airports are way off in old 810 format, so using a custom start or tower view location from my groundnetworks might put you anywhere. But I've even had a dispute with Robin, so I've to check back 850 airport locations as soon as they're in git.Are 850 already in git? Peter, I've also to adjust scenery height. Suisse04 scenery won't be GPL'd mainly because it uses different licences. In fact I didn't bother all authors about such, also because I don't like the idea of some people making money with freeware. Daniel Gauthier for example told me that it must be free of charge! Not GPL compatible then!... http://www.swissfir.org/downloads/Scenery/Gauthier/Gauthier.html Thanks and cheers Michael |
From: Frederic B. <fre...@fr...> - 2011-09-29 07:06:23
|
----- Mail original ----- > Thorsten: I had an account and created a ssh key. Now it has a red > cross > below ready in gitorious. Something wrong with that? > Now the fgdata clone should be on my pc alike the fgfs wiki or where? > How to push or put a merge request?? If you cloned the official data repository on your own machine, you won't be allowed to push anything. What you have to do is to clone the repository in your own gitorious.org project and then clone that clone on your own machine. As it is your own project, you will be able to push into it and then submit merge requests. Regards, -Fred |
From: Anders G. <and...@gi...> - 2011-09-29 07:53:17
|
On Thu, 29 Sep 2011, Frederic Bouvier wrote: > If you cloned the official data repository on your own machine, you > won't be allowed to push anything. > > What you have to do is to clone the repository in your own > gitorious.org project and then clone that clone on your own machine. As > it is your own project, you will be able to push into it and then submit > merge requests. Now, before anyone unnecessarily goes through the pain of cloning fgdata again, you just need to add the git URL to your new personal clone at gitorious as a remote in your local fgdata clone to be able to push to gitorious. For example: git remote add gi...@gi...:~andersg/fg/anders-fgdata.git my-fgdata Stores the URL to my fgdata clone at gitorious under the name my-fgdata in my local git clone of fgdata. (You want the gitorious SSH URL for your repository) git push my-fgdata my-branch:master Pushes the local branch named my-branch to my-fgdata (i.e. my clone of fgdata at gitorious) where the branch will be named master. Cheers, Anders -- --------------------------------------------------------------------------- Anders Gidenstam WWW: http://www.gidenstam.org/FlightGear/ |
From: Anders G. <and...@gi...> - 2011-09-29 09:02:56
|
On Thu, 29 Sep 2011, Anders Gidenstam wrote: > For example: > > git remote add gi...@gi...:~andersg/fg/anders-fgdata.git my-fgdata Oups, that should be git remote add my-fgdata gi...@gi...:~andersg/fg/anders-fgdata.git Cheers, Anders -- --------------------------------------------------------------------------- Anders Gidenstam WWW: http://www.gidenstam.org/FlightGear/ |
From: Durk T. <dur...@gm...> - 2011-09-30 06:45:23
|
Hi Michael, On 29 Sep 2011, at 08:44, Michael Sgier wrote: > > Durk: I've only seen some lone hangars with terrasync but no probably not all as they are for 850 format. As HB-GRAL stated some airports are way off in old 810 format, so using a custom start or tower view location from my groundnetworks might put you anywhere. But I've even had a dispute with Robin, so I've to check back 850 airport locations as soon as they're in git. > > > If you have committed apt.dat files, to robin peel than I think that we could consider committing your ground networks to the terrasync repository. We currently have already quite a few (if not most) ground networks in the scenery that are based on future improvement of the scenery (in anticipation of the improved scenery generation process that Martin is putting a lot of effort into). So, if you have contributed new apt.dat info that would be used in this buidl process then it would be okay. But, I suspect that your ground networks contain parking information only? I would rather see fully developed ground networks, that can also be used for AI purposes. So, in the end, I would recommend that instead of committing these data to the fgdata repository, you bundle them with your own scnery distribution instead (i.e. you in addition to the Terrain/ and Objects/ directories, you'd provide an additional Airports/ directory in your package. FlightGear 2.4.0 should be able to read the parking data when you include the new scenery folder in your path. Cheers Durk |
From: Michael S. <scr...@ya...> - 2011-09-30 10:34:34
|
Durk, I only saw now the lszh ai. How should I create such for other airports? Martin, I've no problem releasing all on GPL but I won't go asking all authors for permission nor be responsibly for any violations.Anyone having all permissions, feel free to integrate my Suisse04 airports in fgfs. |
From: Durk T. <dur...@gm...> - 2011-10-06 06:28:36
|
Hi Michael, On 30 Sep 2011, at 12:33, Michael Sgier wrote: > Durk, I only saw now the lszh ai. How should I create such for other airports? > > > The LSZH network was done by a very early version of taxidraw and misses a lot of features that were subsequently added. I still need to find some time to go back and work on these. I'd recommend downloading taxidraw and having a look at one of the more developed airports (EHAM for example, as it makes use of pretty much all the features available. For more background information, see: http://wiki.flightgear.org/Interactive_Traffic and more specifically, see: http://wiki.flightgear.org/Interactive_Traffic#Ground_networks The page needs some updating, but most information should still be adequate. Cheers, Durk |
From: Martin S. <Mar...@mg...> - 2011-09-30 08:05:53
|
Durk Talsma wrote: > If you have committed apt.dat files, to robin peel [...] That's quite interesting. As far as I understood from Michael's various rants, he doesn't license his work under the GPL - please correct me if I'm wrong. On the other hand, you automagically license under the GPL by the act of submissing to Robin. Unfortunately Robin's v8.10 file, the format which we're still using, has been unmaintained for three years now, therefore, if I'm correct about the licensing, Michael's effort is pretty pointless, whichever route we take: Either we're not permitted to use it because of his incompatible licensing or we can't because Robin's v8.10 file is unmaintained. Cheers, Martin. -- Unix _IS_ user friendly - it's just selective about who its friends are ! -------------------------------------------------------------------------- |
From: Michael S. <scr...@ya...> - 2011-09-30 09:47:44
|
Martin ur a jerk. I've told to have submitted to 850 airports maintained by Robin. Pls read before rant about things you have no clue of. Durk, sure I can also add AI if you can give me an example groundnetwork.For now, I took lszh as pattern. --- On Fri, 9/30/11, Martin Spott <Mar...@mg...> wrote: From: Martin Spott <Mar...@mg...> Subject: Re: [Flightgear-devel] git To: fli...@li... Date: Friday, September 30, 2011, 10:05 AM Durk Talsma wrote: > If you have committed apt.dat files, to robin peel [...] That's quite interesting. As far as I understood from Michael's various rants, he doesn't license his work under the GPL - please correct me if I'm wrong. On the other hand, you automagically license under the GPL by the act of submissing to Robin. Unfortunately Robin's v8.10 file, the format which we're still using, has been unmaintained for three years now, therefore, if I'm correct about the licensing, Michael's effort is pretty pointless, whichever route we take: Either we're not permitted to use it because of his incompatible licensing or we can't because Robin's v8.10 file is unmaintained. Cheers, Martin. -- Unix _IS_ user friendly - it's just selective about who its friends are ! -------------------------------------------------------------------------- ------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2dcopy2 _______________________________________________ Flightgear-devel mailing list Fli...@li... https://lists.sourceforge.net/lists/listinfo/flightgear-devel |
From: Martin S. <Mar...@mg...> - 2011-09-30 09:54:13
|
Michael Sgier wrote: > Martin ur a jerk. I know :-) Martin. -- Unix _IS_ user friendly - it's just selective about who its friends are ! -------------------------------------------------------------------------- |
From: Durk T. <dur...@gm...> - 2011-09-28 19:43:31
|
> create mode 100644 Scenery/Airports/L/S/G/LSGS.groundnet.xml > create mode 100644 Scenery/Airports/L/S/G/LSGS.twr.xml > create mode 100644 Scenery/Airports/L/S/M/LSMP.groundnet.xml > create mode 100644 Scenery/Airports/L/S/M/LSMP.twr.xml > create mode 100644 Scenery/Airports/L/S/Z/LSZB.groundnet.xml > create mode 100644 Scenery/Airports/L/S/Z/LSZB.twr.xml > create mode 100644 Scenery/Airports/L/S/Z/LSZC.groundnet.xml > create mode 100644 Scenery/Airports/L/S/Z/LSZC.twr.xml > create mode 100644 Scenery/Airports/L/S/Z/LSZS.groundnet.xml > create mode 100644 Scenery/Airports/L/S/Z/LSZS.twr.xml > To everyone: Please note that it is our policy not to upload Scenery information to the fgdata repository directly. For logistical reasons, scenery data is committed to the custom scenery project and from there it is synched into the Scenery directory. For scene models and landclass data Martin Spott and Jon Stockill would be the first points of contact, for groundnetworks and possibly also tower locations, you can correct me. To Michael: Are your groundnet and tower files compatible with the current scenery, and are the released under the GPL licence? Cheers, Durk |
From: Pigeon <pi...@pi...> - 2007-07-24 00:01:31
|
> 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. |