From: Jonathan Nieder <jrnieder@gmail.com>
To: Josef Wolf <jw@raven.inka.de>
Cc: git@vger.kernel.org
Subject: Re: Network problems during "git svn dcommit"
Date: Sun, 26 Dec 2010 18:57:39 -0600 [thread overview]
Message-ID: <20101227005739.GA32713@burratino> (raw)
In-Reply-To: <20101222115008.GA10765@raven.wolf.lan>
Josef Wolf wrote:
> I am using git-svn to track a subversion repository. This used to work
> fine so far. But today, I got a network outage during a "git svn dcommit"
> operation.
[...]
> Any hints how to fix the situation?
Yes.
To fix your repository:
1. make backups!
2. back out the bad commit so it is not visible with "gitk --all"
(something like
git reset --keep HEAD^
git push . HEAD:refs/remotes/svn/Trunk
)
3. "rm -fr .git/svn/". Note: this will delete your unhandled.log!
Restore it from backup if you consider it precious.
4. "git svn fetch; git svn rebase"
To fix "git svn", see [1].
Hope that helps,
Jonathan
[1] http://thread.gmane.org/gmane.comp.version-control.git/136510
prev parent reply other threads:[~2010-12-27 0:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-22 11:50 Network problems during "git svn dcommit": need help! Josef Wolf
2010-12-27 0:57 ` Jonathan Nieder [this message]
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=20101227005739.GA32713@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=jw@raven.inka.de \
/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).