Git development
 help / color / mirror / Atom feed
From: "Björn Steinbrink" <B.Steinbrink@gmx.de>
To: Bruno Harbulot <Bruno.Harbulot@manchester.ac.uk>
Cc: git@vger.kernel.org
Subject: Re: git-svn dcommit gone wrong and git-fsck
Date: Tue, 26 Aug 2008 19:36:05 +0200	[thread overview]
Message-ID: <20080826173605.GA32301@atjola.homenet> (raw)
In-Reply-To: <g91bgi$8cm$1@ger.gmane.org>

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

That should do.

Björn

  reply	other threads:[~2008-08-26 17:37 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-26 16:37 git-svn dcommit gone wrong and git-fsck Bruno Harbulot
2008-08-26 17:36 ` Björn Steinbrink [this message]
2008-08-26 18:01   ` Bruno Harbulot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080826173605.GA32301@atjola.homenet \
    --to=b.steinbrink@gmx.de \
    --cc=Bruno.Harbulot@manchester.ac.uk \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox