Re: [Flightgear-devel] File sizes in fgdata, clean up needed?
And another warning: the complete history issue also affects personal git branches on gitorious. So, if an a/c designer adds 19 versions of an image file to his private branch and then placed a merge request to fgdata/master - then the merge will actually copy the history of all 19 file versions to the master branch - even the history of files which were already dropped on the private branch. So, in such cases it's a good idea to not actually git merge the complete personal branch to our master - but to simply take a copy of the latest version of the a/c files and to submit them to master using a fresh commit (I think that's what our fgdata-merge-committers do anyway - at least I hope so...). Or maybe any git expert knew if there was a git-merge-without-history command? You can merge a branch using one commit with git merge --squash branch_to_merge git commit The merge --squash applies the changes from all the commits to the current branches working tree and stages them. It also creates a commit message that concatenates all the commit messages for the ones that are being merged. git commit then allows you to edit that message (and commit of course). Basically it does exactly what you're after :) Cheers, Luuk -- Colocation vs. Managed Hosting A question and answer guide to determining the best fit for your organization - today and in the future. http://p.sf.net/sfu/internap-sfd2d ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] GIT strangeness
When you use git rebase, it tries to replay your local commits on top of the new commits in the master branch. If you have multiple commits to the same files locally that have also been committed upstream, you will be trying to replay old changes on top of new ones. A better solution when you have committed upstream is probably to do a merge rather than a rebase. e.g git checkout master # switch to master branch git pull # update it git checkout master.local # switch back to the individual branch git merge master # update it which would leave your repository looking something like this: * Merge branch 'master' into master.local (master.local points to here) |\ | * local commit 5 | * local commit 4 | * local commit 3 | * local commit 2 | * local commit 1 * | commit 10 (master points to here) * | commit 9 * | commit 8 * | commit 7 * | commit 6 |/ * commit 5 * commit 4 * commit 3 * commit 2 * commit 1 On Thu, Mar 3, 2011 at 7:00 AM, Heiko Schulz aeitsch...@yahoo.de wrote: Hi, Working on my projects I usually commit my changes to my local branch several time the week. And to be update, I pull to master and rebase from master to my local branch. Like that: git checkout master # switch to master branch git pull # update it git checkout master.local # switch back to the individual branch git rebase master # update it That has been working all the time without any problem. Now I noticed a strange thing: At the weekend Gijs had commited my latest changes on the Ec130. After that I did the same procedure like always. But with that I got now several merging conflicts messages, even regarding older commits to the ec130. That's something I wonder: only my changes to the ec130 are affected, all others not. What can be the cause, and how to prevent it? Thanks Heiko -- Free Software Download: Index, Search Analyze Logs and other IT data in Real-Time with Splunk. Collect, index and harness all the fast moving IT data generated by your applications, servers and devices whether physical, virtual or in the cloud. Deliver compliance at lower cost and gain new business insights. http://p.sf.net/sfu/splunk-dev2dev ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel -- Colocation vs. Managed Hosting A question and answer guide to determining the best fit for your organization - today and in the future. http://p.sf.net/sfu/internap-sfd2d ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
[Flightgear-devel] Not currently tuned to any ATC service
Hi, I'm building flightgear from source and am seeing an issue when I try to access the ATC dialog by pushing [']. Instead of coming up with the dialog it just says Not currently tuned to any ATC service. I know that it is tuned to the correct frequency. The frequencies show up in the frequencies dialog, so something in flightgear knows about them. The other interesting thing is that if I fly out of range I get the message saying I am clear of the tower's airspace, which would imply that I am tuned to the correct frequency. I've noticed a few users on the forum are having this same issue, but no useful responses. I'm running on ubuntu jaunty, using the build script on the wiki. I've modified the script to use the git servers instead. Currently I'm using the v2.0.0 release. Cheers, Luuk -- Download Intel#174; Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
[Flightgear-devel] Not currently tuned to any ATC service
Hi,
I'm building flightgear from source and am seeing an issue when I try
to access the ATC dialog by pushing [']. Instead of coming up with
the dialog it just says Not currently tuned to any ATC service. I
know that it is tuned to the correct frequency. The frequencies show
up in the frequencies dialog, so something in flightgear knows about
them. The other interesting thing is that if I fly out of range I get
the message saying I am clear of the tower's airspace, which would
imply that I am tuned to the correct frequency.
I've noticed a few users on the forum are having this same issue, but
no useful responses.
I'm running on ubuntu jaunty, using the build script on the wiki.
I've modified the script to use the git servers instead. Currently
I'm using the v2.0.0 release.
Looking into this further, it's quite obvious why it isn't working:
FGATC* atcptr = globals-get_ATC_mgr()-GetComm1ATCPointer();
-- This function is hardcoded to return 0.
if (!atcptr) {
label = Not currently tuned to any ATC service;
Not being able to communicate with the tower seems like a fairly big
regression to me. I know it didn't do a whole lot, but if you're
trying to follow tutorials that teach you the correct procedures for
coming in to land or taking off, it's a bit of a pain if you can't
even bring up the menu. I can see that this code is being rewritten,
but releasing it half finished is probably not ideal. Is there
anything that can be done easily to make this work again?
Cheers,
Luuk
--
Download Intel#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
