Durk Talsma wrote: > Hi Tim, > > On Friday 23 January 2009 23:40:47 Timothy Moore wrote: >> Durk Talsma wrote: > >> How is this going? I've checked in a couple of fixes to the flightgear and >> simgear maint branches since 18 January. >> >> Tim >> > > I think we're pretty much ready. I built a binary from the git repositories, > and they work well with the original 1.9.0 base package. I'm still fooling > around with git a little bit, and it looks like I'm having some trouble > fetching the latest updates. From within the flightgear/simgear directories, > I > ran > > git fetch > > which did seem to do some updating, but then running git log gives me > > commit 5567eb1fff2e5335d77f495779da55f8bb9e09f9 > Author: Tim Moore <timo...@redhat.com> > Date: Thu Jan 15 16:03:34 2009 +0100 > > as the latest commit for flightgear > > and > > commit b5840650706bd21a44c0bcdad4621adafa8b2bc6 > Author: Tim Moore <timo...@redhat.com> > Date: Wed Jan 14 22:13:12 2009 +0100 > > as the latest commit for simgear. > As John says, it's very important that you have the "maint" branch checked out. There's a master branch in the repos in order to keep the "git clone" command happy, but all the action is on the "maint" and "next" branches, and "maint" is what I'm proposing for 1.9.1.
Also, "git fetch" by itself only updates your copies of remote branches, not your local copies. You need to follow "git fetch" by "git merge", or "git rebase origin"; the latter is recommended if you're doing work that you intend to check back into CVS. Also, "git pull" may be a simpler alternative for you, which does "git fetch" + "git merge." > Also, to test whether this was just me, I did a new clone of the entire > directory, which also gave me these commits as the latest ones. > Again, make sure you git checkout maint. Tim ------------------------------------------------------------------------------ This SF.net email is sponsored by: SourcForge Community SourceForge wants to tell your story. http://p.sf.net/sfu/sf-spreadtheword _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
