From: Avery Pennarun <apenwarr@gmail.com>
Date: Tue, 30 Mar 2010 23:14:15 GMT
Subject: Re: sadly requesting help
Message-ID: <32541b131003301614iad1fedfl85020ba9e285045f@mail.gmail.com>
In-Reply-To: <eaacf13c1003301543r45bb18b2n1d10d209f01e3326@mail.gmail.com>

On Tue, Mar 30, 2010 at 6:43 PM, Raymond Auge <raymond.auge@liferay.com> wrote:
> I tried using:
>
> git svn reset --revision 49343
>
> where 49343 is the last revision before the failure.
>
> But I'm at git version 1.6.3.3 which doesn't support the "reset" operation.

I don't know about this option, but if it sounds like it would work,
why not just upgrade your git?  It's very easy (easier than most
programs) to compile it from source.

> I tried various incantations of
>
> git reset --hard <hash>
>
> where <hash> matched the subversion revision obtained

You probably need something like:

    git update-ref refs/remotes/git-svn <commitid>

Where "refs/remotes/git-svn" is the ref that git-svn is using (you can
usually find this with "git branch -r" and then prepend refs/remotes/
to the name it gives you).  And <commitid> is the commit you want to
be the "most recent" one from svn.

You may or may not also need to delete your svn cache dir (.git/svn).
This should be harmless since git-svn can regenerate it later by
reading through your local commits.

MAKE SURE YOU BACKUP YOUR REPO BEFORE TRYING ANY OF THIS ADVICE.

Good luck,

Avery