git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Chris Ball <ceball@users.sourceforge.net>
To: git@vger.kernel.org
Subject: Interrupted git-svn dcommit, now I get segmentation faults
Date: Thu, 21 Feb 2008 06:49:33 +0000 (UTC)	[thread overview]
Message-ID: <loom.20080221T062522-821@post.gmane.org> (raw)

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
sure what to do (and probably using Git in a clumsy way).

How I caused the problem:

$ git commit -m "msg" path/to/file
Created commit bee0414: msg
 1 files changed, 6 insertions(+), 0 deletions(-)
$ git-svn dcommit
Committing to https://svn/repository ...
	M	path/to/file
Committed r8041
# ** Interruption with ctrl-c happened right at this point **


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


Checking the SVN repository itself, I found the commit was actually
successful (in that it appears as normal in the SVN respository). I
deleted my copy of the file, ran 'git-svn rebase', and then used 'git
checkout path/to/file. This gave me seemingly the correct version
(i.e. with the updates).

This would all be ok, except that now, whenever I git-svn dcommit
anything, this happens:

$ git-svn dcommit
Committing to https://svn/repository ...
	M	path/to/different/file
Committed r8044
Segmentation fault

The commit is successful (i.e. appears in the SVN repository).

Can anyone suggest what I should do? I still have a full transcript
of the session in case that will help. 

I'm using Ubuntu 6.06 LTS. My versions of git, git-svn, and svn (all
from Ubuntu packages):

$ git --version
git version 1.5.3.6
$ git-svn --version
git-svn version 1.5.3.6 (svn 1.3.2)


Thanks very much for any help,

Chris

             reply	other threads:[~2008-02-21  6:55 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-21  6:49 Chris Ball [this message]
2008-02-21 19:27 ` Interrupted git-svn dcommit, now I get segmentation faults Sam Vilain
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=loom.20080221T062522-821@post.gmane.org \
    --to=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).