Björn Steinbrink wrote:
On 2008.08.26 17:37:36 +0100, Bruno Harbulot wrote:
Hello,
I had 11 consecutive commits in my local git repository that I was
trying to commit to an SVN repository, using "git-svn dcommit". The
first 7 worked fine, as usual. However, when sending the 8th, I got a
"Bus error" (on OSX -- I'm not sure what the actual cause was).
A further "git-svn dcommit" produces this error.
Cannot dcommit with a dirty index. Commit your changes first, or stash
them with `git stash'.
at /opt/local/bin/git-svn line 406
1. git checkout $your_branch
2. Look up the latest commit you had on your branch using "git reflog"
or "git log -g"
3. git reset --hard $that_commit
4. git svn rebase
5. check that your history is sane
6. git svn dcommit
Thanks a lot! It works.
Best wishes,
Bruno.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
