{"thread":{"id":"19246","subject":"Problem with local branches and git svn rebase","startedAt":"2009-05-08T08:57:10Z","lastAt":"2009-05-08T14:41:48Z","messageCount":2,"participants":["Dan Fairs"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"113332","messageId":"08FCF5E0-A2AA-4F23-9C23-E8F823AF2546@gmail.com","threadId":"19246","inReplyTo":null,"subject":"Problem with local branches and git svn rebase","fromName":"Dan Fairs","fromEmail":"dan.fairs@gmail.com","sentAt":"2009-05-08T08:57:10Z","receivedAt":"2009-05-08T08:57:10Z","isPatch":false,"sender":{"key":"dan.fairs@gmail.com","avatar":null},"body":"Hi,\n\nI'm experiencing a problem with local branches and the git svn rebase  \ncommand. I'm using git 1.5.5.1. Basically, I can no longer 'git svn  \nrebase'.\n\nI've been doing all my work on a local branch 'work' which I've been  \nsuccessfully using with a remote SVN repository successfully for  \nweeks. I yesterday needed to do some disruptive work, so I committed  \neverything on my 'work' branch, created a new branch 'onlinehacking',  \nchecked it out, did some work on that, and committed. I then tried to  \ncheck out my original 'work' branch and run a git svn rebase to pull  \ndown my colleagues' work. Here's what happens:\n\nbash-3.2$ git br\banch\n   dan-bf-merge-lc\n   master\n* onlinehacking\n   work\nbash-3.2$ git status\n# On branch onlinehacking\nnothing to commit (working directory clean)\nbash-3.2$ git checkout work\nerror: Entry 'online.cfg' not uptodate. Cannot merge.\nbash-3.2$ git checkout -m work\nChecking out files:   8% (169/2051)\n   ... snip ...\nChecking out files: 100% (2051/2051)\nChecking out files: 100% (2051/2051), done.\nM\tonline.cfg\nM\tproducts/online/Formulator/CREDITS.txt\n\n    ... snip ...\n\nM\tproducts/online/Formulator/www/StringField.gif\nM\tproducts/online/Formulator/www/TextAreaField.gif\nSwitched to branch \"work\"\nbash-3.2$ git svn rebase\nCannot rebase with uncommited changes:\n# On branch work\nnothing to commit (working directory clean)\nstatus: command returned error: 1\n\nbash-3.2$ git status\n# On branch work\nnothing to commit (working directory clean)\nbash-3.2$ git diff\n\u001bbash-3.2$ git diff --cached\n\u001bbash-3.2$\n\nI'm still pretty new to git, so I'm sure that I've done somthing  \nstupid, not git. I tried adding the -m option to 'git checkout work'  \nas advised by the git-checkout man page, but git diff doesn't show any  \nchanges afterwards.\n\nWhat have I done wrong, and how can I pull latest changes from svn  \ninto my work branch?\n\nThanks,\nDan\n--\nDan Fairs <dan.fairs@gmail.com> | http://www.fezconsulting.com/\n"},{"id":"113350","messageId":"BE627AFF-29EA-48E7-A91F-40B29FF36AF5@gmail.com","threadId":"19246","inReplyTo":"08FCF5E0-A2AA-4F23-9C23-E8F823AF2546@gmail.com","subject":"Re: Problem with local branches and git svn rebase","fromName":"Dan Fairs","fromEmail":"dan.fairs@gmail.com","sentAt":"2009-05-08T14:41:48Z","receivedAt":"2009-05-08T14:41:48Z","isPatch":false,"sender":{"key":"dan.fairs@gmail.com","avatar":null},"body":"> I'm experiencing a problem with local branches and the git svn  \n> rebase command. I'm using git 1.5.5.1. Basically, I can no longer  \n> 'git svn rebase'.\n\n\nFor the benefit of the archive, a git rebase --abort on the 'work'  \nbranch fixed the issue, despite giving a 'No rebase in progress?'  \nmessage. Thanks to tvakah on #git.\n\nThanks\nDan\n\n--\nDan Fairs <dan.fairs@gmail.com> | http://www.fezconsulting.com/\n"}]}