Re: [Flightgear-devel] git help request
The typical fix is to edit the conflicting files and git add them the run git rebase --continue. But these files don't exist so I can't edit them, git add fails, git rm also fails since they don't exist. If the files no longer exist, I think one solution is to tell the system to skip the patch: git rebase --skip did the trick for me on a similar occasion. The rebase operation then goes on with the next patch. If you actually want the files, git checkout branch where files still exist -- non-existing file should fetch them from the branch where they still exist. I also frequently use git status to track what exactly the problem is. Although I am probably not the best source for GIT troubleshooting, I feel your pain. I've had similar trouble a few times. Cheers, * Thorsten -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git help request
It looks like every time you rebase you have to reapply the same set of patches over top the target branch. So even if I figure out a way through it once, I'll have to repeat the same conconction of craziness each time I rebase. I think I'm going to create a new branch, untar my changes on top, lose all my history and forget about it. I didn't budget 2 full days to fiddle with this and I'm frustrated and annoyed now and unsure what/if/anything I've lost or broken -- blahhh ... little things you might not notice for 6 months because you don't work with every file every day ... Curt. On Thu, Aug 9, 2012 at 1:56 AM, Renk Thorsten thorsten.i.r...@jyu.fiwrote: The typical fix is to edit the conflicting files and git add them the run git rebase --continue. But these files don't exist so I can't edit them, git add fails, git rm also fails since they don't exist. If the files no longer exist, I think one solution is to tell the system to skip the patch: git rebase --skip did the trick for me on a similar occasion. The rebase operation then goes on with the next patch. If you actually want the files, git checkout branch where files still exist -- non-existing file should fetch them from the branch where they still exist. I also frequently use git status to track what exactly the problem is. Although I am probably not the best source for GIT troubleshooting, I feel your pain. I've had similar trouble a few times. Cheers, * Thorsten -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://gallinazo.flightgear.org -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git help request
On Thu, 9 Aug 2012, Curtis Olson wrote: It looks like every time you rebase you have to reapply the same set of patches over top the target branch. So even if I figure out a way through it once, I'll have to repeat the same conconction of craziness each time I rebase. I think I'm going to create a new branch, untar my changes on top, lose all my history and forget about it. I didn't budget 2 full days to fiddle with this and I'm frustrated and annoyed now and unsure what/if/anything I've lost or broken -- blahhh ... little things you might not notice for 6 months because you don't work with every file every day ... If you can figure out which commits cause the problems you can edit them out of your branch (or, better, out of a copy of it) using git rebase -i HEAD~42 (change 42 to the number of commits back from HEAD that you need to touch). See also the manual page for git rebase and http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages Cheers, Anders -- --- Anders Gidenstam WWW: http://gitorious.org/anders-hangar http://www.gidenstam.org/FlightGear/ -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git help request
On Thu, Aug 9, 2012 at 10:44 AM, Anders Gidenstam anders-...@gidenstam.orgwrote: If you can figure out which commits cause the problems you can edit them out of your branch (or, better, out of a copy of it) using git rebase -i HEAD~42 (change 42 to the number of commits back from HEAD that you need to touch). See also the manual page for git rebase and http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages I appreciate all the suggestions, it is getting slightly more complicated than I want to deal with today. :-) I did play with interactive git rebase, but my brain overheated trying to imagine what happens and what downstream breakage might occur if I skip a commit that involves renaming directories? And then I'd still have to remember the exact sequence of steps each time I did a new rebase. Apparently rebase doesn't quite do what I expected it to do -- it catches you up, but later if you do another rebase apparently it redoes all your changes from day 1 of your branch. There is probably a good reason for doing it this way, but I was imagining that a rebase was a one time operation and future rebases would be able to start from where the previous one finished off. Maybe that doesn't make any sense? I'm probably a bit confused in either case -- flightgear seems to force you to jump into the deep end of the git pool right away. :-) -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://gallinazo.flightgear.org -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git help request
On 08/09/2012 07:45 AM, Curtis Olson wrote: It looks like every time you rebase you have to reapply the same set of patches over top the target branch. Not true in general. I've never had a problem like that. So even if I figure out a way through it once, I'll have to repeat the same conconction of craziness each time I rebase. Ditto. It complains about whitespace errors, then falls back to a 3-way merge, then reports conflicts with all the files in the 2 old directories, If whitespace were the only problem, you could make the problem go away using --no-verify. Also, as others have suggested, when in doubt, doing git status is always a good idea. I think I'm going to create a new branch, untar my changes on top, lose all my history and forget about it. Creating new branches is cheap and often an excellent idea, especially if you are uncertain about something and want to experiment. untar my changes on top, lose all my history and forget about it. It's not possible to be sure exactly what the problem is without further information, but it seems likely that there is a simpler way to get a similar result without losing history, namely: git rebase -Xours or git rebase -s 'recursive -Xours' You can read the manpage and/or google for more information about what these options do. I believe these options require git version 1.7.3 or later. If you need to install a newer git, that's easy and well worthwhile. -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git help request
On Thu, Aug 9, 2012 at 2:45 PM, Curtis Olson curtol...@gmail.com wrote: It looks like every time you rebase you have to reapply the same set of patches over top the target branch. So even if I figure out a way through it once, I'll have to repeat the same conconction of craziness each time I rebase. I think I'm going to create a new branch, untar my changes on top, lose all my history and forget about it. I didn't budget 2 full days to fiddle with this and I'm frustrated and annoyed now and unsure what/if/anything I've lost or broken -- blahhh ... little things you might not notice for 6 months because you don't work with every file every day ... Curt. If you are going to keep a branch for a long time that you are not merging back into e.g., master, there are a couple of possibilities. One is to merge (pull) master into your branch. Another is to check out git-rerere (I kid you not), which records merge conflict resolutions and reapplies them automatically when needed. With that you can either rebase repeatedly or never rebase and periodically do test merges with master. Tim On Thu, Aug 9, 2012 at 1:56 AM, Renk Thorsten thorsten.i.r...@jyu.fi wrote: The typical fix is to edit the conflicting files and git add them the run git rebase --continue. But these files don't exist so I can't edit them, git add fails, git rm also fails since they don't exist. If the files no longer exist, I think one solution is to tell the system to skip the patch: git rebase --skip did the trick for me on a similar occasion. The rebase operation then goes on with the next patch. If you actually want the files, git checkout branch where files still exist -- non-existing file should fetch them from the branch where they still exist. I also frequently use git status to track what exactly the problem is. Although I am probably not the best source for GIT troubleshooting, I feel your pain. I've had similar trouble a few times. Cheers, * Thorsten -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://gallinazo.flightgear.org -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git help request
On Thu, Aug 9, 2012 at 11:50 AM, Tim Moore wrote: If you are going to keep a branch for a long time that you are not merging back into e.g., master, there are a couple of possibilities. One is to merge (pull) master into your branch. Another is to check out git-rerere (I kid you not), which records merge conflict resolutions and reapplies them automatically when needed. With that you can either rebase repeatedly or never rebase and periodically do test merges with master. My typical workflow is to pull the master branch (daily at least) and then when there are updates, checkout my private branch and git merge master. That's worked fine, except it is my understanding that this is frowned upon because some day if I ever cherry pick something back into the master branch, the commit log will get prefaces with a couple hundred merge messages. The rebase supposedly puts my local changes at the top. Every thing generally works as it's supposed to I think, except the double directory mv in a single commit seemed to completely confuse the subsequent rebase. I think I'm just going to file this under: git gives you more than enough rope to hang yourself by, especially when you venture away from the simple/common usage cases and don't have a complete understanding of what git does under the hood and how each command manipulates the internal state. I haven't lost anything (other than 2 days of my life) :-) -- and I still have my old branch, now renamed with all the history; so for the moment I've created a new branch, moved all the different stuff to that (I hope) and will continue on from there. Regards, Curt. -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://gallinazo.flightgear.org -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git help request
A quick update here. Rob pointed out the git rebase --abort command which got me back to a sensible working state. I was able to reevaluate my original problem which turned out to be a simple merge conflict in my branch vs. changes in master and I was able to fix that and successfully merge -- so I'm in a reasonable working state again. But I would mind rebasing my local changes, but I still get an error. I think what happened originally is I changed the directory name of my aircraft from Malolo1 to Resolution, then thought for a second and changed it again to ATI-Resolution -- and then did that all as a single commit. Now the rebase throws fits on that patch. It complains about whitespace errors, then falls back to a 3-way merge, then reports conflicts with all the files in the 2 old directories, for example: Aircraft/Malolo1/Engines/18x8.xml: needs merge Aircraft/Resolution/Engines/18x8.xml: needs merge The typical fix is to edit the conflicting files and git add them the run git rebase --continue. But these files don't exist so I can't edit them, git add fails, git rm also fails since they don't exist. I suppose I could abandon this branch, figure out the diffs against master manually, create a new branch, and copy those diffs into my new branch -- but then I would lose all my history and that just doesn't seem very git-ish -- I hate to go against the spirit of git which is more along the lines of performing brain surgery on myself when I don't quite feel happy -- what could go wrong? Or what do I do when something goes wrong? :-) Curt. On Wed, Aug 8, 2012 at 9:27 AM, Curtis Olson curtol...@gmail.com wrote: I've run into a problem with git and I seem to hit a dead end no matter which way I turn. I'm hoping this is something easy to solve, but the details might be complicated to communicate? I'll try to start simple -- I'm working with the fgdata repository. I created my own branch and have been tracking some experimental stuff there. This has been working well and when I do a git pull I will checkout my local branch and merge with the master to make sure everything is tracking well and stays compatible. With my most recent attempt to merge my local branch with master I got an error (unfortunately now I do not remember what the exact error was, and I had to do a reboot for other reasons in the mean time.) My first thought after getting an error trying to merge was maybe I should rebase since I've just been merging all along. So I ran git rebase and that ran did a lot of work, but then generated some error messages about whitespace, and then displayed some message that it had to fall back to a 3-way diff. That ran and ran for quite some time and (I think?) errored out. Again, I don't have the message any more. :-( Now after my reboot, I'm trying to figure out what's going on. If I run git branch I get: $ git branch * (no branch) If I try to checkout any branch I get a list of files that need merge and then the message: error: you need to resolve your current index first. If I git add any of these files, what branch am I adding them to and merging them into? (no branch)? It seems like all the git help I can find for these error messages presumes I can checkout a branch -- but I can't. Any suggestions? Thanks, Curt. -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://gallinazo.flightgear.org -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://gallinazo.flightgear.org -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git help request
On Wed, Aug 8, 2012 at 10:45 AM, Curtis Olson curtol...@gmail.com wrote: A quick update here. Rob pointed out the git rebase --abort command which got me back to a sensible working state. I was able to reevaluate my original problem which turned out to be a simple merge conflict in my branch vs. changes in master and I was able to fix that and successfully merge -- so I'm in a reasonable working state again. But I would mind rebasing my local changes, but I still get an error. I think what happened originally is I changed the directory name of my aircraft from Malolo1 to Resolution, then thought for a second and changed it again to ATI-Resolution -- and then did that all as a single commit. Now the rebase throws fits on that patch. It complains about whitespace errors, then falls back to a 3-way merge, then reports conflicts with all the files in the 2 old directories, for example: Aircraft/Malolo1/Engines/18x8.xml: needs merge Aircraft/Resolution/Engines/18x8.xml: needs merge The typical fix is to edit the conflicting files and git add them the run git rebase --continue. But these files don't exist so I can't edit them, git add fails, git rm also fails since they don't exist. I suppose I could abandon this branch, figure out the diffs against master manually, create a new branch, and copy those diffs into my new branch -- but then I would lose all my history and that just doesn't seem very git-ish -- I hate to go against the spirit of git which is more along the lines of performing brain surgery on myself when I don't quite feel happy -- what could go wrong? Or what do I do when something goes wrong? :-) brain surgery --abort :-) Curt. -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://gallinazo.flightgear.org -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git help request
It sounds like your local tree has not been completely committed. See what git status says. Check out the man page for git-mv. I can't say more right at the moment, but I'll see if I can add more details later. Tim On Wed, Aug 8, 2012 at 5:45 PM, Curtis Olson curtol...@gmail.com wrote: A quick update here. Rob pointed out the git rebase --abort command which got me back to a sensible working state. I was able to reevaluate my original problem which turned out to be a simple merge conflict in my branch vs. changes in master and I was able to fix that and successfully merge -- so I'm in a reasonable working state again. But I would mind rebasing my local changes, but I still get an error. I think what happened originally is I changed the directory name of my aircraft from Malolo1 to Resolution, then thought for a second and changed it again to ATI-Resolution -- and then did that all as a single commit. Now the rebase throws fits on that patch. It complains about whitespace errors, then falls back to a 3-way merge, then reports conflicts with all the files in the 2 old directories, for example: Aircraft/Malolo1/Engines/18x8.xml: needs merge Aircraft/Resolution/Engines/18x8.xml: needs merge The typical fix is to edit the conflicting files and git add them the run git rebase --continue. But these files don't exist so I can't edit them, git add fails, git rm also fails since they don't exist. I suppose I could abandon this branch, figure out the diffs against master manually, create a new branch, and copy those diffs into my new branch -- but then I would lose all my history and that just doesn't seem very git-ish -- I hate to go against the spirit of git which is more along the lines of performing brain surgery on myself when I don't quite feel happy -- what could go wrong? Or what do I do when something goes wrong? :-) Curt. On Wed, Aug 8, 2012 at 9:27 AM, Curtis Olson curtol...@gmail.com wrote: I've run into a problem with git and I seem to hit a dead end no matter which way I turn. I'm hoping this is something easy to solve, but the details might be complicated to communicate? I'll try to start simple -- I'm working with the fgdata repository. I created my own branch and have been tracking some experimental stuff there. This has been working well and when I do a git pull I will checkout my local branch and merge with the master to make sure everything is tracking well and stays compatible. With my most recent attempt to merge my local branch with master I got an error (unfortunately now I do not remember what the exact error was, and I had to do a reboot for other reasons in the mean time.) My first thought after getting an error trying to merge was maybe I should rebase since I've just been merging all along. So I ran git rebase and that ran did a lot of work, but then generated some error messages about whitespace, and then displayed some message that it had to fall back to a 3-way diff. That ran and ran for quite some time and (I think?) errored out. Again, I don't have the message any more. :-( Now after my reboot, I'm trying to figure out what's going on. If I run git branch I get: $ git branch * (no branch) If I try to checkout any branch I get a list of files that need merge and then the message: error: you need to resolve your current index first. If I git add any of these files, what branch am I adding them to and merging them into? (no branch)? It seems like all the git help I can find for these error messages presumes I can checkout a branch -- but I can't. Any suggestions? Thanks, Curt. -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://gallinazo.flightgear.org -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://gallinazo.flightgear.org -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ Flightgear-devel mailing list
Re: [Flightgear-devel] git help request
On Wed, Aug 8, 2012 at 12:06 PM, Tim Moore wrote: It sounds like your local tree has not been completely committed. See what git status says. Check out the man page for git-mv. I can't say more right at the moment, but I'll see if I can add more details later. There are a couple other random untracked changes, but nothing inside any of the directories that were renamed and now failing on the rebase. Curt;. -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://gallinazo.flightgear.org -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
