Hi Curt,
A while back Tim Moore offered to post the image warping code onto the
GIT site. Since then I've not heard from him and emails have gone
unanswered -- no idea as to why... :-(
At any rate, tried to setup a GIT library myself and nothing but
frustration and zero success in setting up a
Hello Luuk,
First I have to say Thanks for answering!
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
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
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
No one has answered yet which makes me guess (a) I didn't ask very well or
(b) no one knows the answer, so let me try again here.
I created a local clone of my fgdata repository using the --local option
which builds hard links to the master original repository and saves lots of
space. The clone
Ok, I think I figured this out. The clue was in the error message I posted.
I had the branch in question checked out in my main repository clone, so
the system couldn't push changes from my --local clone of the branch back
into that branch in the primary clone.
I guess that makes some sort of
Here locally I made a local clone of the fgdata repository using git clone
-l fgdata fgdata-wip. That seemed to work as advertised.
I noticed that the only branch available in the new local clone fgdata-wip
is the branch that is active in fgdata at the time the clone is made
that's good to
Curtis Olson wrote:
The other implication here is that it would be extremely handy to have
multiple branches checked out simultaneously for other reasons. git makes
branching easy, yes, but if you find yourself bouncing between branches with
changes for separate projects, and external events
[saw this in time to de-lurk]
On 01/25/2011 11:22 AM, Anders Gidenstam wrote:
I suspect the option --local to git clone might be useful.
I have not tried myself, though.
Yeah, this is the best answer for this kind of problem.
The .git directory ends up being near-zero size (so long as the
On Wed, Jan 26, 2011 at 1:21 AM, Stefan Seifert n...@detonation.org wrote:
Well you don't. Often you just can leave modified files in place while
switching
branches. If it's not working, you still can simply git stash before
switching. git stash creates a temporary branch and commits your
On 24.01.2011 22:49, James Turner wrote:
Perhaps another approach would be to do out-of-source builds. I think
automake/conf should support that, although it's been a while since I've
tried it.
Cmake is very good at out-of-source builds :)
Hmm. The out-of-source builds alone don't really
On Tue, 25 Jan 2011, ThorstenB wrote:
You'll also need to keep git from touching any _sources_, so maintain
two sets of matching sources and their objects. Using two completely
separate repos helps - or the magic feature to create two separate
source checkouts from one repository, which James
On 25 Jan 2011, at 19:22, Anders Gidenstam wrote:
I suspect the option --local to git clone might be useful.
I have not tried myself, though.
The thing I was thinking of is:
git-new-workdir
Which essentially symlinks the key pieces of .git between two different dirs.
Documentation
On Tue, Jan 25, 2011 at 1:22 PM, Anders Gidenstam wrote:
I suspect the option --local to git clone might be useful.
I have not tried myself, though.
Once you get it all figured out, please let us know how, so we can get setup
correctly too. :-)
Thanks,
Curt.
--
Curtis Olson:
On Tue, 25 Jan 2011, Curtis Olson wrote:
Once you get it all figured out, please let us know how, so we can get setup
correctly too. :-)
I'm not sure this counts as figuring it all out.. :)
anders@sleipner:/opt/FlightGear$ du -sk fgdata
7930604 fgdata
anders@sleipner:/opt/FlightGear$ git
On Tue, Jan 25, 2011 at 7:44 PM, ThorstenB bre...@gmail.com wrote:
make isn't smart
enough to notice that the older object files were generated from (older)
sources, which had identical content to the current (newer) sources.
Right. Enter ccache :)
--
Csaba/Jester
The other implication here is that it would be extremely handy to have
multiple branches checked out simultaneously for other reasons. git makes
branching easy, yes, but if you find yourself bouncing between branches with
changes for separate projects, and external events may require you to jump
On Wednesday 26 January 2011 01:34:35 Curtis Olson wrote:
The other implication here is that it would be extremely handy to have
multiple branches checked out simultaneously for other reasons. git makes
branching easy, yes, but if you find yourself bouncing between branches
with changes for
I have another git question:
James has created v2.2.0 release branches on the git server.
I would like to keep up-to-date builds of both versions here.
If I switch branches in the source tree, git switches the files under
version control but doesn't touch any files it doesn't know about.
On Mon, Jan 24, 2011 at 9:01 PM, Curtis Olson wrote:
If I do a build of the next branch,
then switch to the releases/2.2.0 branch, I still inherit all the build
object files from the other branch. So then I have to do a complete make
clean; make for simgear and flightgear each time I want to
Hi Curt,
The best way to handle this is definitely using out-of-source builds.
In your git repo, just create build-branch dir's, and build from
there. For autotools, just run ../configure make make install,
or ccmake .. make make install if you want to use cmake. I do
this all the time, works
On 24 Jan 2011, at 20:01, Curtis Olson wrote:
Perhaps another approach would be to do out-of-source builds. I think
automake/conf should support that, although it's been a while since I've
tried it.
Cmake is very good at out-of-source builds :)
Of course configure can do them too - and
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
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
On Mon, Jan 10, 2011 at 5:31 PM, Curtis Olson curtol...@gmail.com 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:
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
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
On Tue, Jan 4, 2011 at 2:44 PM, Curtis Olson wrote:
Ok, thanks for all the advice. git diff --cached did show me my actual
change that git diff had lost. I doubt I'll remember that next time I
need it. So I'll look at making changes to a branch in the future. At the
moment I'm just trying
Another git question ...
I created a mychanges branch with git branch mychanges.
I run git branch and I see a * beside mychanges in the list of branches.
I make a small test edit to a file (src/GUI/MapWidget.cxx).
I run git checkout next to return to the pristine unchanged branch that
tracks
On Fri, Jan 7, 2011 at 6:58 PM, Curtis Olson wrote:
I make a small test edit to a file (src/GUI/MapWidget.cxx).
I run git checkout next to return to the pristine unchanged branch that
tracks the head on gitorious --- but here is the output:
$ git checkout next
M src/GUI/MapWidget.cxx
On Fri, Jan 7, 2011 at 6:58 PM, Curtis Olson wrote:
I make a small test edit to a file (src/GUI/MapWidget.cxx).
I run git checkout next to return to the pristine unchanged branch that
tracks the head on gitorious --- but here is the output:
$ git checkout next
M src/GUI/MapWidget.cxx
On Fri, Jan 7, 2011 at 7:48 PM, Curtis Olson wrote:
So what happens if I'm messing around with my WildCrazyIdea-I-WantToTry
branch over lunch, and suddenly I get a phone call and have to jump back to
doing something serious with FlightGear and need to quickly switch back to
my RealWork branch.
Hi Thorsten,
Thanks for explaining this in detail.
So here is my next question related to dealing with local branches.
Let's say I make a local branch, make some changes, and I'm finally happy
with those changes, so I commit them. (Or maybe I've committed several
revisions of my changes over
Hi Curt,
git merge is your friend! Perhaps a complete example workflow will
help you get along:
suppose you are on branch next tracking the gitorious branch next.
git branch wip -- wip is now an exact copy of the next branch
git checkout wip
Edit files to add some really cool feature
git
Curtis Olson wrote:
- What is the best way to clean up my next branch of all the changes I had
previously made before I created my own branch? I'd like to return it to
it's pristine untouched state now that I have a local branch for my local
changes.
If anything else fails, if next in your
Hi Stefan,
Thanks for the reply. You are exactly right to notice that I am struggling
a bit to understand the proper git workflow when dealing with branches. I
have a couple more questions inserted below ...
On Fri, Jan 7, 2011 at 1:39 PM, stefan riemens wrote:
Hi Curt,
git merge is your
Hi Curt,
2011/1/7 Curtis Olson curtol...@gmail.com:
Hi Stefan,
Thanks for the reply. You are exactly right to notice that I am struggling
a bit to understand the proper git workflow when dealing with branches. I
have a couple more questions inserted below ...
On Fri, Jan 7, 2011 at 1:39
I have a git question.
I'm trying to git push a new joystick config someone sent me. When I run
git push I get the following message:
$ git push
To g...@gitorious.org:fg/fgdata.git
! [rejected]master - master (non-fast-forward)
error: failed to push some refs to
What I always do is keep the master (next in FG's case) completely in
sync with upstream's master branch. For local modifications I always
use another branch. That way, pulling and pushing always works as
you'd expect. Merging is easy and cheap with git, i love that!
PS, I'm not really a git
That's probably not a bad tip, but I'm in a situation now where I have local
mods that git diff does not report and I'm not sure how to deal with that.
How can I find the differences between my local repository and the master
... especially those changes that I haven't committed or pushed yet?
On 01/04/2011 10:20 AM, Curtis Olson wrote:
I'm in a situation now where I have local
mods that git diff does not report and I'm not sure how to deal with that.
How can I find the differences between my local repository and the master
... especially those changes that I haven't committed
On Tue, Jan 4, 2011 at 5:20 PM, Curtis Olson wrote:
That's probably not a bad tip, but I'm in a situation now where I have
local mods that git diff does not report and I'm not sure how to deal with
that. How can I find the differences between my local repository and the
master ... especially
On Tue, Jan 4, 2011 at 5:36 PM, Curtis Olson curtol...@gmail.com wrote:
I have a git question.
I'm trying to git push a new joystick config someone sent me. When I run
git push I get the following message:
$ git push
To g...@gitorious.org:fg/fgdata.git
! [rejected]master -
Ok, thanks for all the advice. git diff --cached did show me my actual
change that git diff had lost. I doubt I'll remember that next time I
need it. So I'll look at making changes to a branch in the future. At the
moment I'm just trying to unwind my current tree. Apologies if I screw
FGDATA site seems to be down or have problems. I have tried about 5
times over time to get fgdata with the same error.
--
73 de Donn Washburn
307 Savoy Street Email: n5...@comcast.net
Sugar Land, TX 77478 LL# 1.281.242.3256
Ham Callsign N5XWB HAMs : n5...@arrl.net
VoIP via Gizmo:
On 12/23/2010 12:24 PM, Gijs de Rooy wrote:
FGDATA site seems to be down or have problems. I have tried about 5
times over time to get fgdata with the same error.
Gitorious was down since earlier today. However, it appears to be up
again now.
You can still obtain fgdata from the
Am 23.12.10 19:35, schrieb Donn Washburn:
On 12/23/2010 12:24 PM, Gijs de Rooy wrote:
FGDATA site seems to be down or have problems. I have tried about 5
times over time to get fgdata with the same error.
Gitorious was down since earlier today. However, it appears to be up
again now.
You
On 12/23/2010 01:14 PM, Torsten Dreyer wrote:
Am 23.12.10 19:35, schrieb Donn Washburn:
On 12/23/2010 12:24 PM, Gijs de Rooy wrote:
FGDATA site seems to be down or have problems. I have tried about 5
times over time to get fgdata with the same error.
Gitorious was down since earlier today.
On 12/23/2010 01:14 PM, Torsten Dreyer wrote:
Am 23.12.10 19:35, schrieb Donn Washburn:
On 12/23/2010 12:24 PM, Gijs de Rooy wrote:
FGDATA site seems to be down or have problems. I have tried about 5
times over time to get fgdata with the same error.
Gitorious was down since earlier today.
just using the default - ./fgfs enter I get this error.
Base package check failed ... Found version [none] at: @PKGLIBDIR
Please upgrade to version: 2.0.0
You need to tell FG where your data directory is. Do that with
--fg-root=/usr/share/flightgear
in your commandline, or set FG_ROOT in
Torsten Dreyer wrote:
I saw many reports that mapserver is a faster than gitorious. Thanks,
Thanks to our sponsor (- Telascience) !
Cheers,
Martin.
--
Unix _IS_ user friendly - it's just selective about who its friends are !
Hey Group;
I have had a problem mentioned today concerning PKGGLIBDIR. This was
from a effort with cmake and ccmake. fgfs compiled completely but
lacking a make check function I directly installed it.
Tried it and got Base package check failed ... Found version [none]
at: @PKGLIBDIR
Hi,
I am the guy who is officially in charge to maintain the grtux hangar.
However that model ( like the others by Gérard which are coming from the old
cvs repo ) has not been updated for months.
Right now, none of these models are working since, were done to fly up to
FG 1.9.1.
Some of these
with the topic Nonfunctional airplane
http://sourceforge.net/mailarchive/message.php?msg_id=26649893
i had sent an answer regarding the known duplicate models.
quote==
Hi,
That won't be a problem for the FlighGear users,
These models are getting duplicated with some others
On 12/12/2010 06:31 PM, henri orange wrote:
with the topic Nonfunctional airplane
http://sourceforge.net/mailarchive/message.php?msg_id=26649893
i had sent an answer regarding the known duplicate models.
quote==
Hi,
That won't be a problem for the FlighGear users,
On Mon, Dec 13, 2010 at 2:40 AM, Donn Washburn n5...@comcast.net wrote:
Same/similar here on today's flightgear and fgdata
P-38-Lightning:
COPYING F-5B-set.xml LIS-MOI_GNU-GPL
P-38L-splash.rgb Sounds
Engines Help Models
P38-SetBase.xml
On 12/12/2010 07:50 PM, Csaba Halász wrote:
On Mon, Dec 13, 2010 at 2:40 AM, Donn Washburnn5...@comcast.net wrote:
Same/similar here on today's flightgear and fgdata
P-38-Lightning:
COPYINGF-5B-set.xml LIS-MOI_GNU-GPL
P-38L-splash.rgb Sounds
Engines Help
Geoff McLane wrote:
A question. Is there a way to get an email advice of git commits, like
I used to get with cvs?
Yes, this is possible. The EMail notifications I'm generating at the
MapServer GIT repository are a lot more informative than those from
Gitorious, probably even a bit too verbose
Thanks :-)
On 23/09/10 19:01, Torsten Dreyer wrote:
I think I can remove the expermiental state and cleanup
the dialog.
... what I just did. And it's Stereoscopic View Options under View now.
Enjoy, Torsten
--
Best Regards
Willie Fleming
On Wed, Sep 22, 2010 at 10:09 PM, Durk Talsma wrote:
On Wednesday, September 22, 2010 10:54:05 pm willie wrote:
If enough people are upset by this, then its easily moved back ..
Having said that, I'm not so sure that this menu is purely a developers tool,
since I can imagine that there
On 23/09/10 11:24, Stuart Buchanan wrote:
On Wed, Sep 22, 2010 at 10:09 PM, Durk Talsma wrote:
On Wednesday, September 22, 2010 10:54:05 pm willie wrote:
If enough people are upset by this, then its easily moved back ..
Having said that, I'm not so sure that this menu is purely a
OK OK OK -I'll move it back
I'd like you all to know that this change of heart is _entirely_
unrelated to my finding a pair of these red/green specs in the kids
bedroom and wanting to have a shot at this 3D stuff for
myself:-)
Naa - your to late! I already spent hours in
I think I can remove the expermiental state and cleanup
the dialog.
... what I just did. And it's Stereoscopic View Options under View now.
Enjoy, Torsten
--
Nokia and ATT present the 2010 Calling All
On Sun, Sep 19, 2010 at 10:06 AM, Vivian Meazza wrote:
I'll merge it into git. Perhaps there will be some further comments, or
suggestions for improvements then.
In general, this looks good. Thanks very much for taking some time to
improve the menu structure. It's very easy for those of us who
Hi All,
On Wednesday, September 22, 2010 10:31:22 pm Stuart Buchanan wrote:
On Sun, Sep 19, 2010 at 10:06 AM, Vivian Meazza wrote:
I'll merge it into git. Perhaps there will be some further comments, or
suggestions for improvements then.
In general, this looks good. Thanks very much for
One quick observation regarding the new menu structure: I noticed that the
new OSG rendering options menu item, that was recently added by Torsten,
under the view menu, has disappeared. Since I wanted to test the new
stereoscopic vision modes, I reverted my git fgdata tree back to an
On 22/09/10 21:48, Torsten Dreyer wrote:
One quick observation regarding the new menu structure: I noticed that the
new OSG rendering options menu item, that was recently added by Torsten,
under the view menu, has disappeared. Since I wanted to test the new
stereoscopic vision modes, I
On 22/09/10 21:48, Torsten Dreyer wrote:
One quick observation regarding the new menu structure: I noticed that
the new OSG rendering options menu item, that was recently added by
Torsten, under the view menu, has disappeared. Since I wanted to test
the new stereoscopic vision modes, I
On Wednesday, September 22, 2010 10:54:05 pm willie wrote:
If enough people are upset by this, then its easily moved back ..
Not upset, just surprised that it was no longer there. :-) (And fortunately, I
can easily roll back my fgdata to head, with just a few keystrokes).
Having said
Torsten Dreyer wrote:
One quick observation regarding the new menu structure: I noticed that the
new OSG rendering options menu item, that was recently added by Torsten,
under the view menu, has disappeared. Since I wanted to test the new
stereoscopic vision modes, I reverted my git fgdata
On Wed, 22 Sep 2010, willie wrote:
To me, most of Debug should be Advanced but I got outvoted in the
democracy that is IRC on that one so it stayed as Debug :-)
Advanced Debug? *runs*
g.
--
Proud owner of F-15C 80-0007
http://www.f15sim.com - The only one of its kind.
Am 20.09.10 06:53, schrieb willie:
On 19/09/10 11:29, Vivian Meazza wrote:
Gijs,
The 4^th dimension has re-emerged. Anything else need fixing?
Err - did we lose the Weather Scenario as well?
Ive put it back in and moved the ATC in Range to the F12 Radio
Settings dialog - yes I
On 20/09/10 07:42, Torsten Dreyer wrote:
Am 20.09.10 06:53, schrieb willie:
On 19/09/10 11:29, Vivian Meazza wrote:
Gijs,
The 4^th dimension has re-emerged. Anything else need fixing?
Err - did we lose the Weather Scenario as well?
Ive put it back in and moved the ATC in Range to the F12
Well seeing as no-one has said they absolutely hate this, can we get it
merged into git, please?
http://gitorious.org/~willief/fg/williefs-fgdata/commits/new-menu
On 09/09/10 10:17, willie wrote:
A quick clarification re the keybord shortcuts - I I simply want to
display them on the menu,
Looks good to me! One thing though: where is the timeofday dialog?
Also, our gui does not yet support sub-menus, right? Would be nice
it it did, and would make the menus a little less long...
Cheers,
Gijs
To: FlightGear Development list
Subject: Re: [Flightgear-devel] Git Merge Request - was Re: tidy up of the
menu
Looks good to me! One thing though: where is the timeofday dialog?
Also, our gui does not yet support sub-menus, right? Would be nice
it it did, and would make the menus a little less long
On 19/09/10 10:25, Gijs de Rooy wrote:
Looks good to me! One thing though: where is the timeofday dialog?
Also, our gui does not yet support sub-menus, right? Would be nice
it it did, and would make the menus a little less long...
Sub-menus would be nice, however I was informed they were Evil -
September 2010 10:26
*To:* FlightGear Development list
*Subject:* Re: [Flightgear-devel] Git Merge Request - was Re: tidy up of
the menu
Looks good to me! One thing though: where is the timeofday dialog?
Also, our gui does not yet support sub-menus, right? Would be nice
it it did, and would make
On Fri, 2010-08-06 at 07:59 -0600, dave perry wrote:
I am not seeing the slowdown. I just ran a simple script that updates
simgear, flightgear source, and fgdata. I would estimate that the git
pull origin run in fgdata took about 3 minutes. This performance has
been typical for me. I
Hi folks,
On my 64 bit linux machine, git uses a *lot* of virtual memory.
PID PPID USER TTY NI CODE VIRT RES SWAP SHR WCHAN S
%CPU %MEM TIME COMMAND
26069 26055 hcs pts/20 0 860 1406m 9560 1.4g 6784 -
S0 0.2 0:00 git-fetch
26079 26069 hcs pts/20 0
--
From: Alasdair ali...@btinternet.com
Sent: Saturday, August 07, 2010 10:47 AM
To: FlightGear developers discussions
flightgear-devel@lists.sourceforge.net
Cc: vivian.mea...@lineone.net
Subject: Re: [Flightgear-devel] GIT and FGDATA
On Fri
Alan Teeder wrote
--
From: Alasdair ali...@btinternet.com
Sent: Saturday, August 07, 2010 10:47 AM
To: FlightGear developers discussions
flightgear-devel@lists.sourceforge.net
Cc: vivian.mea...@lineone.net
Subject: Re: [Flightgear-devel
Cc: vivian.mea...@lineone.net
Subject: Re: [Flightgear-devel] GIT and FGDATA
On Fri, 2010-08-06 at 07:59 -0600, dave perry wrote:
I am not seeing the slowdown. I just ran a simple script that updates
simgear, flightgear source, and fgdata. I would estimate that the
git pull origin
-devel@lists.sourceforge.net
Cc: vivian.mea...@lineone.net
Subject: Re: [Flightgear-devel] GIT and FGDATA
On Fri, 2010-08-06 at 07:59 -0600, dave perry wrote:
I am not seeing the slowdown. I just ran a simple script that
updates
simgear, flightgear source, and fgdata. I would
On Sat, 7 Aug 2010 22:20:33 +0100, Vivian wrote in message
97168810c6ee43daaf3a43ad098c8...@main:
Hal V. Engel wrote
I have been using Cola GIT http://cola.tuxfamily.org/ as my GIT GUI
front end
on my Linux box and it works nicely. Start up is a little slow when
opening a
fgdata
Alan Teeder wrote
Same here. But the slow-down has been quicker than the increase in data
over
time. I am to be yet to be convinced that there isn't something else
going
on besides the increase in the amount of data. I'm beginning to suspect
that
the whole concept is
--
From: Vivian Meazza vivian.mea...@lineone.net
I had reached the same conclusion: it does conform to the observed fact
that
the slow-down has been faster than the increase in data. The splitting of
the repo might not overcome the problem if
I am not seeing the slowdown. I just ran a simple script that updates
simgear, flightgear source, and fgdata. I would estimate that the git
pull origin run in fgdata took about 3 minutes. This performance has
been typical for me. I ran System Monitor (F12) during the fgdata pull
and the
--
From: dave perry skida...@mindspring.com
Sent: Friday, August 06, 2010 2:59 PM
To: vivian.mea...@lineone.net; FlightGear developers discussions
flightgear-devel@lists.sourceforge.net
Subject: Re: [Flightgear-devel] GIT and FGDATA
I am
Alan Teeder wrote
I am not seeing the slowdown. I just ran a simple script that updates
simgear, flightgear source, and fgdata. I would estimate that the git
pull origin run in fgdata took about 3 minutes. This performance has
been typical for me. I ran System Monitor (F12) during
Here Git works well for Simgear and Flightgear, but a sync/pull of Fgdata
kills either of my windows boxes. It has been getting slower and
slll and today has ground to a complete halt.
Now that the aircraft directory can be defined separate from FGROOT (and
hence the rest of
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
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
Hi Dave,
On Friday 02 July 2010 10:21:11 pm dave perry wrote:
Thanks Tim,
Here's the result:
[...@dave-pc fgdata]$ git push origin master
fatal: protocol error: expected sha/ref, got '
--
The git:// protocol is read-only.
Please use the push
On Fri, Jul 2, 2010 at 10:21 PM, dave perry skida...@mindspring.com wrote:
Thanks Tim,
Here's the result:
[...@dave-pc fgdata]$ git push origin master
fatal: protocol error: expected sha/ref, got '
--
The git:// protocol is read-only.
Please
On 07/03/2010 02:52 AM, Tim Moore wrote:
On Fri, Jul 2, 2010 at 10:21 PM, dave perry skida...@mindspring.com
mailto:skida...@mindspring.com wrote:
Thanks Tim,
Here's the result:
[...@dave-pc fgdata]$ git push origin master
fatal: protocol error: expected sha/ref, got '
Thanks Tim,
Here's the result:
[...@dave-pc fgdata]$ git push origin master
fatal: protocol error: expected sha/ref, got '
--
The git:// protocol is read-only.
Please use the push url as listed on the repository page.
JFTR: I *did* answer, but your provider rejected it
skida...@mindspring.com:
Connected to 207.69.189.219 but sender was rejected.
Remote host said: 550 550 Dynamic/zombied/spam IPs blocked. \
Write blockedbyearthl...@abuse.earthlink.net
m.
Good news, switching to Ubuntu 10.04 LTS solved all git problems for me.
No idea why Xandros 4.5 gave me problems but Xandros seemed to have
abandoned the desktop market anyhow. For what it's worth, I'm very
pleased with Ubuntu so far.
Erik
I pushed a wrong branch by accident, which will mess up history in the repo.
Not the end of the world, but Tim can fix it if people avoid committing to fg
(simgear and fgdata are unaffected) until he's rolled back my mistake. There's
a separate issue that the build will be broken following my
101 - 200 of 314 matches
Mail list logo
