git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Sam Vilain <sam@vilain.net>
To: Chris Ball <ceball@users.sourceforge.net>
Cc: git@vger.kernel.org
Subject: Re: Interrupted git-svn dcommit, now I get segmentation faults
Date: Fri, 22 Feb 2008 08:27:18 +1300	[thread overview]
Message-ID: <47BDD096.7040606@vilain.net> (raw)
In-Reply-To: <loom.20080221T062522-821@post.gmane.org>

Chris Ball wrote:
> Hi,
> 
> I mistakenly interrupted a git-svn dcommit, and now whenever I run
> git-svn dcommit I get a segmentation fault, but the commit is
> successful. I have just switched from Subversion to Git, so I'm not
 [...]
> git diff still showed the change on my machine, so I ran git-svn dcommit
> again:
> 
> $ git-svn dcommit
> Committing to https://svn/repository ...
> Merge conflict during commit: Your file or directory 'path/to/file' is
> probably out-of-date: The version resource does not correspond to the
> resource within the transaction.  Either the requested version
> resource is out of date (needs to be updated), or the requested
> version resource is newer than the transaction root (restart the
> commit). at /usr/bin/git-svn line 420

If you get stuff like that you can move the git-svn state out of the
way, and re-run git-svn fetch; it will rebuild the metadata.

 $ mv .git/svn .git/svn.bad
 $ git-svn fetch

Not a fix I know, but might work for you ;)

Sam.

  reply	other threads:[~2008-02-21 19:26 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-21  6:49 Interrupted git-svn dcommit, now I get segmentation faults Chris Ball
2008-02-21 19:27 ` Sam Vilain [this message]
2008-02-22  9:13   ` C. E. Ball
2008-02-22  9:20     ` C. E. Ball
2008-02-23  3:18       ` Sam Vilain
2008-03-05  9:00         ` C. E. Ball

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=47BDD096.7040606@vilain.net \
    --to=sam@vilain.net \
    --cc=ceball@users.sourceforge.net \
    --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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).