Re: [Flightgear-devel] git question

[Ron Jensen]

On Sunday 19 February 2012 15:28:05 Scott wrote:
> On Sun, 2012-02-19 at 14:40 -0700, dave perry wrote:
> > On 02/19/2012 02:06 PM, Torsten Dreyer wrote:
> > > Am 19.02.2012 21:54, schrieb dave perry:
> > >> Hi All,
> > >>
> > >> I have been gone for almost a year.  I want to start new source trees
> > >> for simgear and flightgear and track on going development.  Which git
> > >> branches should I "check out" in this new set of directories?  And
> > >> from the e-mails I have read from the developers list, is appears that
> > >> fgdata still has all the aircraft under development.
> > >>
> > >> I plan to rate all the AC I have made significant contributions to via
> > >> the published rules and push them to the repository.
> > >
> > > Hi Dave,
> > >
> > > welcome back! The latest development is in 'next' for SimGear and
> > > FlightGear and 'master' for fgdata. Yes, fgdata still holds all
> > > aircraft.
> > >
> > > Some basic instructions are in the wiki:
> > > http://wiki.flightgear.org/Git
> > >
> > > Torsten
> > >
> > > ---
> > >--- Virtualization&  Cloud Management Using Capacity Planning
> > > Cloud computing makes use of virtualization - but cloud computing
> > > also focuses on allowing computing to be delivered as a service.
> > > http://www.accelacomm.com/jaw/sfnl/114/51521223/
> > > ___
> > > Flightgear-devel mailing list
> > > Flightgear-devel@lists.sourceforge.net
> > > https://lists.sourceforge.net/lists/listinfo/flightgear-devel
> >
> > Thanks Torsten,
> >
> > The wiki link is just what I needed to refresh my memory.  I their a
> > similar reference for the change to cmake?
> >
> > Dave P.
>
> There is a README.cmake in the top level directory once you clone the
> repository that is quite helpful. There is also the wiki page at
> http://wiki.flightgear.org/Building_using_CMake
>
> Typing cmake and hitting the search button will find that for you from
> the wiki front page :)
>
>
> S.



http://wiki.flightgear.org/Talk:Building_using_CMake

I put some notes on the discussion page for that page, too...

Ron


--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Re: [Flightgear-devel] git question

[Scott]

On Sun, 2012-02-19 at 14:40 -0700, dave perry wrote:
> On 02/19/2012 02:06 PM, Torsten Dreyer wrote:
> > Am 19.02.2012 21:54, schrieb dave perry:
> >> Hi All,
> >>
> >> I have been gone for almost a year.  I want to start new source trees
> >> for simgear and flightgear and track on going development.  Which git
> >> branches should I "check out" in this new set of directories?  And from
> >> the e-mails I have read from the developers list, is appears that fgdata
> >> still has all the aircraft under development.
> >>
> >> I plan to rate all the AC I have made significant contributions to via
> >> the published rules and push them to the repository.
> > Hi Dave,
> >
> > welcome back! The latest development is in 'next' for SimGear and
> > FlightGear and 'master' for fgdata. Yes, fgdata still holds all aircraft.
> >
> > Some basic instructions are in the wiki:
> > http://wiki.flightgear.org/Git
> >
> > Torsten
> >
> > --
> > Virtualization&  Cloud Management Using Capacity Planning
> > Cloud computing makes use of virtualization - but cloud computing
> > also focuses on allowing computing to be delivered as a service.
> > http://www.accelacomm.com/jaw/sfnl/114/51521223/
> > ___
> > Flightgear-devel mailing list
> > Flightgear-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/flightgear-devel
> >
> Thanks Torsten,
> 
> The wiki link is just what I needed to refresh my memory.  I their a 
> similar reference for the change to cmake?
> 
> Dave P.


There is a README.cmake in the top level directory once you clone the
repository that is quite helpful. There is also the wiki page at
http://wiki.flightgear.org/Building_using_CMake

Typing cmake and hitting the search button will find that for you from
the wiki front page :)


S.



--
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Re: [Flightgear-devel] git question

[dave perry]

On 02/19/2012 02:06 PM, Torsten Dreyer wrote:
> Am 19.02.2012 21:54, schrieb dave perry:
>> Hi All,
>>
>> I have been gone for almost a year.  I want to start new source trees
>> for simgear and flightgear and track on going development.  Which git
>> branches should I "check out" in this new set of directories?  And from
>> the e-mails I have read from the developers list, is appears that fgdata
>> still has all the aircraft under development.
>>
>> I plan to rate all the AC I have made significant contributions to via
>> the published rules and push them to the repository.
> Hi Dave,
>
> welcome back! The latest development is in 'next' for SimGear and
> FlightGear and 'master' for fgdata. Yes, fgdata still holds all aircraft.
>
> Some basic instructions are in the wiki:
> http://wiki.flightgear.org/Git
>
> Torsten
>
> --
> Virtualization&  Cloud Management Using Capacity Planning
> Cloud computing makes use of virtualization - but cloud computing
> also focuses on allowing computing to be delivered as a service.
> http://www.accelacomm.com/jaw/sfnl/114/51521223/
> ___
> Flightgear-devel mailing list
> Flightgear-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/flightgear-devel
>
Thanks Torsten,

The wiki link is just what I needed to refresh my memory.  I their a 
similar reference for the change to cmake?

Dave P.


--
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Re: [Flightgear-devel] git question

[Torsten Dreyer]

Am 19.02.2012 21:54, schrieb dave perry:
> Hi All,
>
> I have been gone for almost a year.  I want to start new source trees
> for simgear and flightgear and track on going development.  Which git
> branches should I "check out" in this new set of directories?  And from
> the e-mails I have read from the developers list, is appears that fgdata
> still has all the aircraft under development.
>
> I plan to rate all the AC I have made significant contributions to via
> the published rules and push them to the repository.

Hi Dave,

welcome back! The latest development is in 'next' for SimGear and 
FlightGear and 'master' for fgdata. Yes, fgdata still holds all aircraft.

Some basic instructions are in the wiki:
http://wiki.flightgear.org/Git

Torsten

--
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

[Flightgear-devel] git question

[dave perry]

Hi All,

I have been gone for almost a year.  I want to start new source trees 
for simgear and flightgear and track on going development.  Which git 
branches should I "check out" in this new set of directories?  And from 
the e-mails I have read from the developers list, is appears that fgdata 
still has all the aircraft under development.

I plan to rate all the AC I have made significant contributions to via 
the published rules and push them to the repository.

Dave P.

--
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Re: [Flightgear-devel] git question

[dave perry]

On 01/10/2011 02:19 PM, dave perry wrote:
> I am ready to push some committed fgdata changes from my *master.  But 
> I lost my notes.  Don't want to mess up.  What is the syntax?  git 
> push master/origin?
>
> Thanks,
> Dave
Never mind.  Answer found by git push --help.  Sorry, should have done 
this first.

Dave P.

--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand 
malware threats, the impact they can have on your business, and how you 
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

[Flightgear-devel] git question

[dave perry]

I am ready to push some committed fgdata changes from my *master.  But I 
lost my notes.  Don't want to mess up.  What is the syntax?  git push 
master/origin?

Thanks,
Dave

--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web.   Learn how to 
best implement a security strategy that keeps consumers' information secure 
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl 
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Re: [Flightgear-devel] git question

[Anders Gidenstam]

On Mon, 10 Jan 2011, Curtis Olson wrote:

> remote: Total 1 (delta 0), reused 0 (delta 0)
> Unpacking objects: 100% (1/1), done.
>> From gitorious.org:fg/simgear
> * [new branch]  releases/2.2.0 -> origin/releases/2.2.0
> * [new tag] 2.2.0-rc1  -> 2.2.0-rc1
> Already up-to-date.
>
>
> Ok, cool I think, it looks like the 2.2.0 release branch has been created.
>
> But my question is how can I switch to this new branch?  When I list my
> branches I see:
>
> simgear$ git branch
>  maint
> * next
>
>
> The new branch is not listed.  Does this branch only exist on the server?
> What do I have to do to see the branch locally?  Do I have to manually copy
> any remote branch that I want to work with locally?  What's the git thought
> process and reasoning here?  How would a person typically know that a new
> remote branch got created and be able to access it?  Why doesn't the new
> branch automatically show up in my list of branches?

Hi,

It exists locally as a remote branch. Create a local branch based on it 
with

git branch -t -l my-2.2.0 origin/releases/2.2.0


Cheers,

Anders
-- 
---
Anders Gidenstam
WWW: http://www.gidenstam.org/FlightGear/

--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web.   Learn how to 
best implement a security strategy that keeps consumers' information secure 
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl 
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Re: [Flightgear-devel] git question

[Tim Moore]

On Mon, Jan 10, 2011 at 5:31 PM, Curtis Olson  wrote:

> Here is my next git question (possibly another dumb one) :-)
>
> When I did a git pull in simgear/flightgear this morning I saw something
> like the following:
>
> simgear$ git pull
> remote: Counting objects: 1, done.
> remote: Total 1 (delta 0), reused 0 (delta 0)
> Unpacking objects: 100% (1/1), done.
> From gitorious.org:fg/simgear
>  * [new branch]  releases/2.2.0 -> origin/releases/2.2.0
>  * [new tag] 2.2.0-rc1  -> 2.2.0-rc1
> Already up-to-date.
>
>
> Ok, cool I think, it looks like the 2.2.0 release branch has been created.
>
> But my question is how can I switch to this new branch?  When I list my
> branches I see:
>
> simgear$ git branch
>   maint
> * next
>
>
> The new branch is not listed.  Does this branch only exist on the server?
>  What do I have to do to see the branch locally?  Do I have to manually copy
> any remote branch that I want to work with locally?  What's the git thought
> process and reasoning here?  How would a person typically know that a new
> remote branch got created and be able to access it?  Why doesn't the new
> branch automatically show up in my list of branches?
>
> You can see the remote branches with git "branch -r" or "git branch -a".
You can create a local version of a remote branch with "git branch
releases-2.2.0 origin/releases-2.2.0"or "git checkout -b releases-2.2.0
origin/releases-2.2.0". Git doesn't create a local branch automatically. I
don't know all the reasons, but it would not be clear what to call the local
branch, especially if there are multiple remote repositories with identical
branch names.

Tim

> Thanks,
>
> Curt.
> --
> Curtis Olson:
> http://www.atiak.com - http://aem.umn.edu/~uav/
> http://www.flightgear.org - 
> http://www.flightgear.org/blogs/category/curt/
>
>
>
> --
> Gaining the trust of online customers is vital for the success of any
> company
> that requires sensitive data to be transmitted over the Web.   Learn how to
> best implement a security strategy that keeps consumers' information secure
> and instills the confidence they need to proceed with transactions.
> http://p.sf.net/sfu/oracle-sfdevnl
> ___
> Flightgear-devel mailing list
> Flightgear-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/flightgear-devel
>
>
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web.   Learn how to 
best implement a security strategy that keeps consumers' information secure 
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl ___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

[Flightgear-devel] git question

[Curtis Olson]

Here is my next git question (possibly another dumb one) :-)

When I did a git pull in simgear/flightgear this morning I saw something
like the following:

simgear$ git pull
remote: Counting objects: 1, done.
remote: Total 1 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (1/1), done.
>From gitorious.org:fg/simgear
 * [new branch]  releases/2.2.0 -> origin/releases/2.2.0
 * [new tag] 2.2.0-rc1  -> 2.2.0-rc1
Already up-to-date.


Ok, cool I think, it looks like the 2.2.0 release branch has been created.

But my question is how can I switch to this new branch?  When I list my
branches I see:

simgear$ git branch
  maint
* next


The new branch is not listed.  Does this branch only exist on the server?
 What do I have to do to see the branch locally?  Do I have to manually copy
any remote branch that I want to work with locally?  What's the git thought
process and reasoning here?  How would a person typically know that a new
remote branch got created and be able to access it?  Why doesn't the new
branch automatically show up in my list of branches?

Thanks,

Curt.
-- 
Curtis Olson:
http://www.atiak.com - http://aem.umn.edu/~uav/
http://www.flightgear.org -
http://www.flightgear.org/blogs/category/curt/
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web.   Learn how to 
best implement a security strategy that keeps consumers' information secure 
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl ___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Re: [Flightgear-devel] git question

[dave perry]

Found the problem.  Sorry for the noise.

On my notebook, the
git pull origin
aborted and I did not notice this.  preferences.xml had been changed in 
* master (my local branch).  I did a
git checkout preferences.xml
git pull origin
and got a lot of updates.

Dave P.
On 08/01/2010 01:25 PM, dave perry wrote:
> On 08/01/2010 01:07 PM, dave perry wrote:
>
>> Need some help,
>>
>> I did some clean up of the pa24-250 on my desktop which included
>> creating a pa24-250/Nasal folder and moving all the nasal files to that
>> folder.  I also created pa24-250-base.xml that contained all the common
>> lines for the set file and now pa24-250-CIIB-set.xml and
>> pa24-250-CIII-set.xml contain the lines unique to the two auto pilots
>> and include the common base file.  I did the same for the model files.
>>
>> I used git status to identify what needed to be done before
>> git commit
>> git merge origin/master
>> git push origin master.
>>
>> But when I did a
>> git pull origin
>> from my notebook, I do not see the changes.
>>  


--
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Re: [Flightgear-devel] git question

[dave perry]

On 08/01/2010 01:07 PM, dave perry wrote:
> Need some help,
>
> I did some clean up of the pa24-250 on my desktop which included
> creating a pa24-250/Nasal folder and moving all the nasal files to that
> folder.  I also created pa24-250-base.xml that contained all the common
> lines for the set file and now pa24-250-CIIB-set.xml and
> pa24-250-CIII-set.xml contain the lines unique to the two auto pilots
> and include the common base file.  I did the same for the model files.
>
> I used git status to identify what needed to be done before
> git commit
> git merge origin/master
> git push origin master.
>
> But when I did a
> git pull origin
> from my notebook, I do not see the changes.  If I move the pa24-250
> folder to trash and do a
> git pull pa24-250
> from the Aircraft folder on my desktop, I get back all the changes.  If
> I do the same on my notebook, I get back the pa24-250 w/o the recent
> changes.
>
> I am confused.
>
> Dave P.
>
> --
> The Palm PDK Hot Apps Program offers developers who use the
> Plug-In Development Kit to bring their C/C++ apps to Palm for a share
> of $1 Million in cash or HP Products. Visit us here for more details:
> http://p.sf.net/sfu/dev2dev-palm
> ___
> Flightgear-devel mailing list
> Flightgear-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/flightgear-devel
>
>
In the above note replace "git pull pa24-250" with "git checkout 
pa24-250" as that is what I typed.

--
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

[Flightgear-devel] git question

[dave perry]

Need some help,

I did some clean up of the pa24-250 on my desktop which included 
creating a pa24-250/Nasal folder and moving all the nasal files to that 
folder.  I also created pa24-250-base.xml that contained all the common 
lines for the set file and now pa24-250-CIIB-set.xml and 
pa24-250-CIII-set.xml contain the lines unique to the two auto pilots 
and include the common base file.  I did the same for the model files.

I used git status to identify what needed to be done before
git commit
git merge origin/master
git push origin master.

But when I did a
git pull origin
from my notebook, I do not see the changes.  If I move the pa24-250 
folder to trash and do a
git pull pa24-250
from the Aircraft folder on my desktop, I get back all the changes.  If 
I do the same on my notebook, I get back the pa24-250 w/o the recent 
changes.

I am confused.

Dave P.

--
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Re: [Flightgear-devel] GIT question: How to deal with local changes that should remain local

[Ron Jensen]

On Sunday 20 June 2010 12:07:02 Torsten Dreyer wrote:
> > Hi All,
> >
> > I currently have a number of local changes in my fgdata tree that should
> > either be kept local, or be stored elsewhere. More specifically, I have
> > created a custom camera-settings file that drives three monitors, I have
> > placed this file inside my fgdata directory, and refer to this file from
> > my preferences.xml file. In addition to that, I have s few other minor
> > modifications in preferences,xml that should be kept local.
> >
> > My question is how to keep these changes local without interfering with
> >  git. In essence, I would like to be able to continue to use git to
> > update whatever changes are made to preferences.xml, while keeping my
> > changes local. CVS seemed to be able to merge in any updates, as long as
> > there wasn't a conflict, but GIT seems to be a bit pickier. I did find
> > the git stash command, but I'm not sure yet that this is the most
> > appropriate way to deal with local changes. Therefore I'd like to hear
> > about other possibilities.
> >
> > Alternatively, if there is a way to to get my custom camera settings
> >  working from outside of the fgdata tree then I'd also love to hear about
> >  that (other than writing out all the settings as a series of --prop:
> >  command line options inside .fgfsrc. :-)
>
> Hi Durk,
>
> to ignore files in the tree, add a name (or pattern) to
> $FGDATA/.git/info/exclude
>
> to add a "private" configuration file, use --config=/some/file.xml to your
> commandline. The file.xml is in the format
> 
>   
> foo
>   
> 
>
> to set /some/property=foo
>
> Torsten

The solution I use is branches.  I have a "local" git branch and a "master" 
git branch.  The master branch is a pure clone of the remote repository, and 
all my changes are tracked on "local".  When I update I do something like 
this:

 $git checkout master
 $git pull
 $git checkout local
 $git merge master

Ron

--
ThinkGeek and WIRED's GeekDad team up for the Ultimate 
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
lucky parental unit.  See the prize list and enter to win: 
http://p.sf.net/sfu/thinkgeek-promo
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Re: [Flightgear-devel] GIT question: How to deal with local changes that should remain local

[Torsten Dreyer]

> whereas the relevant code is inserted at the appropriate level when you use
> 
>  from within flightgear.
Yeah - guess, who spent some time on that very same issue, too?

Torsten

--
ThinkGeek and WIRED's GeekDad team up for the Ultimate 
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
lucky parental unit.  See the prize list and enter to win: 
http://p.sf.net/sfu/thinkgeek-promo
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Re: [Flightgear-devel] GIT question: How to deal with local changes that should remain local

[Durk Talsma]

Hi Torsten,

On Sunday 20 June 2010 08:07:02 pm Torsten Dreyer wrote:
> to add a "private" configuration file, use --config=/some/file.xml to your
> commandline. The file.xml is in the format
> 
>   
> foo
>   
> 
>
> to set /some/property=foo
>
Thanks. That did the trick. All private configuration data are now outside of 
fgdata. Ironically I'd gotten pretty close on a previous attempt to do this, 
failed to realize that my camera-view.xml configuration files needs to have 



   [ code here ]



whereas the relevant code is inserted at the appropriate level when you use

 from within flightgear.

Cheers,
Durk
--
ThinkGeek and WIRED's GeekDad team up for the Ultimate 
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
lucky parental unit.  See the prize list and enter to win: 
http://p.sf.net/sfu/thinkgeek-promo___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Re: [Flightgear-devel] GIT question: How to deal with local changes that should remain local

[Torsten Dreyer]

> Hi All,
> 
> I currently have a number of local changes in my fgdata tree that should
> either be kept local, or be stored elsewhere. More specifically, I have
> created a custom camera-settings file that drives three monitors, I have
> placed this file inside my fgdata directory, and refer to this file from my
> preferences.xml file. In addition to that, I have s few other minor
> modifications in preferences,xml that should be kept local.
> 
> My question is how to keep these changes local without interfering with
>  git. In essence, I would like to be able to continue to use git to update
>  whatever changes are made to preferences.xml, while keeping my changes
>  local. CVS seemed to be able to merge in any updates, as long as there
>  wasn't a conflict, but GIT seems to be a bit pickier. I did find the git
>  stash command, but I'm not sure yet that this is the most appropriate way
>  to deal with local changes. Therefore I'd like to hear about other
>  possibilities.
> 
> Alternatively, if there is a way to to get my custom camera settings
>  working from outside of the fgdata tree then I'd also love to hear about
>  that (other than writing out all the settings as a series of --prop:
>  command line options inside .fgfsrc. :-)

Hi Durk,

to ignore files in the tree, add a name (or pattern) to
$FGDATA/.git/info/exclude

to add a "private" configuration file, use --config=/some/file.xml to your 
commandline. The file.xml is in the format

  
foo
  


to set /some/property=foo

Torsten

--
ThinkGeek and WIRED's GeekDad team up for the Ultimate 
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
lucky parental unit.  See the prize list and enter to win: 
http://p.sf.net/sfu/thinkgeek-promo
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

[Flightgear-devel] GIT question: How to deal with local changes that should remain local

[Durk Talsma]

Hi All,

I currently have a number of local changes in my fgdata tree that should 
either be kept local, or be stored elsewhere. More specifically, I have 
created a custom camera-settings file that drives three monitors, I have 
placed this file inside my fgdata directory, and refer to this file from my 
preferences.xml file. In addition to that, I have s few other minor 
modifications in preferences,xml that should be kept local.

My question is how to keep these changes local without interfering with git. 
In essence, I would like to be able to continue to use git to update whatever 
changes are made to preferences.xml, while keeping my changes local. CVS 
seemed to be able to merge in any updates, as long as there wasn't a conflict, 
but GIT seems to be a bit pickier. I did find the git stash command, but I'm 
not sure yet that this is the most appropriate way to deal with local changes. 
Therefore I'd like to hear about other possibilities.

Alternatively, if there is a way to to get my custom camera settings working 
from outside of the fgdata tree then I'd also love to hear about that (other 
than writing out all the settings as a series of --prop: command line options 
inside .fgfsrc. :-)

Cheers,
Durk
--
ThinkGeek and WIRED's GeekDad team up for the Ultimate 
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
lucky parental unit.  See the prize list and enter to win: 
http://p.sf.net/sfu/thinkgeek-promo___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Re: [Flightgear-devel] git question: .gitignore ignored

[Torsten Dreyer]

> A quick style question here.  A single .gitignore file at the top level can
>  be used to ignore files anywhere in the repository.  Wouldn't it be better
>  to keep a single .gitignore at the top-level instead of sprinkling them
>  across the tree?
> 
> For example, there are 43 files that match the files specification:
> 
>  terragear-cs/projects/VC7.1/*gitignore
> 
> 42 of those files are identical, just in different directories.  Do we
>  really want to do that in the flightgear and simgear trees, too?
Certainly not. What I added to gitignore in the separate directories are the 
test executables like magvar/testmagvar or screen/TestRenderTexture. This is 
what we already had in .cvsignore before. Common rules shall be kept in the 
root .gitignore for sure.

Fred - thanks for pointing out the missing 'n'. Trust me, I checked a dozen 
times and never noticed that typo. 

Torsten

--

___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Re: [Flightgear-devel] git question: .gitignore ignored

[Ron Jensen]

On Sunday 23 May 2010 03:04:04 Torsten Dreyer wrote:
> Hi,
>
> I just pushed new .gitignore files to simgear:
>simgear/magvar/.gitigore
>simgear/route/.gitignore
>simgear/screen/.gitignore
>simgear/serial/.gitignore
> and modified the existing .gitignore in simgear`s root.
> While the changes on the existing .gitignore worked as expected, the new
> files don't seem to have any effect.
> What's the magic charm to achieve the desired results here?
>
> Thanks, Torsten
>

A quick style question here.  A single .gitignore file at the top level can be 
used to ignore files anywhere in the repository.  Wouldn't it be better to 
keep a single .gitignore at the top-level instead of sprinkling them across 
the tree?

For example, there are 43 files that match the files specification:

 terragear-cs/projects/VC7.1/*gitignore

42 of those files are identical, just in different directories.  Do we really 
want to do that in the flightgear and simgear trees, too?

Thanks,
Ron

--

___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Re: [Flightgear-devel] git question: .gitignore ignored

[Frederic Bouvier]

Hi,

- "Torsten Dreyer" a écrit :

> Hi,
> 
> I just pushed new .gitignore files to simgear:
>simgear/magvar/.gitigore

You forgot a 'n' here, confirmed here : 
http://gitorious.org/fg/simgear/commit/6a2773c3ac3e38133b61fab574d61ace0ac6f1d4

>simgear/route/.gitignore
>simgear/screen/.gitignore
>simgear/serial/.gitignore
> and modified the existing .gitignore in simgear`s root.
> While the changes on the existing .gitignore worked as expected, the
> new files 
> don't seem to have any effect. 
> What's the magic charm to achieve the desired results here?

-Fred


-- 
Frédéric Bouvier
http://my.fotolia.com/frfoto/  Photo gallery - album photo
http://www.youtube.com/user/fgfred64   Videos


--

___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

[Flightgear-devel] git question: .gitignore ignored

[Torsten Dreyer]

Hi,

I just pushed new .gitignore files to simgear:
   simgear/magvar/.gitigore
   simgear/route/.gitignore
   simgear/screen/.gitignore
   simgear/serial/.gitignore
and modified the existing .gitignore in simgear`s root.
While the changes on the existing .gitignore worked as expected, the new files 
don't seem to have any effect. 
What's the magic charm to achieve the desired results here?

Thanks, Torsten

--

___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel