threads / discuss / 11428

git-svn in 1.5.4~rc2 somewhat broken?

Subject: git-svn in 1.5.4~rc2 somewhat broken?

## tl;dr

3 messages between Dec 30, 2007 and Dec 30, 2007.

replies: 2people: 2as markdown or json

Florian Weimer· Dec 30, 2007, 13:09 UTC · lore

I just tried to run "git svn fetch" on a clone of a Subversion repository that used to work fine with 1.5.3. After trying to fix some things up (sorry, scrollback buffer is not deep enough), it now reports an index mismatch:

Index mismatch: efcc3165fb64519ff1784903112d725c8682d5d2 != b3e7f07b5e4b79f682718fe6a31107d74ca35ce6

And it finally bails out with:

Last fetched revision of refs/remotes/git-svn was r45313, but we are about to fetch: r851!

This doesn't make sense because all paths (both log messages and .git/config) refer to:

  http://llvm.org/svn/llvm-project/llvm/trunk

And this repository certainly contains revisions after r851.

With other repositories, it also peforms an index rebuild, but succeeds.

Steven Walter· Dec 30, 2007, 16:07 UTC · re: Florian Weimer · lore

Re: git-svn in 1.5.4~rc2 somewhat broken?

On Sun, Dec 30, 2007 at 02:09:28PM +0100, Florian Weimer wrote:

Show 10 quoted lines

> I just tried to run "git svn fetch" on a clone of a Subversion
> repository that used to work fine with 1.5.3.  After trying to fix some
> things up (sorry, scrollback buffer is not deep enough), it now reports
> an index mismatch:
> 
> Index mismatch: efcc3165fb64519ff1784903112d725c8682d5d2 != b3e7f07b5e4b79f682718fe6a31107d74ca35ce6
> 
> And it finally bails out with:
> 
> Last fetched revision of refs/remotes/git-svn was r45313, but we are about to fetch: r851!

Messages like these usually mean you've changed refs/remotes/trunk, which will confuse git-svn unless you know what you're doing. Fortunately, you can usually "rm -rf .git/svn" and git-svn will sort itself out on the next fetch.

-- 
-Steven Walter <stevenrwalter@gmail.com>
Freedom is the freedom to say that 2 + 2 = 4
B2F1 0ECC E605 7321 E818  7A65 FC81 9777 DC28 9E8F

Florian Weimer· Dec 30, 2007, 16:33 UTC · re: Steven Walter · lore

Re: git-svn in 1.5.4~rc2 somewhat broken?

* Steven Walter:

Show 5 quoted lines

>> Last fetched revision of refs/remotes/git-svn was r45313, but we are
>> about to fetch: r851!
>
> Messages like these usually mean you've changed refs/remotes/trunk,
> which will confuse git-svn unless you know what you're doing.

Uhm, I don't recall doing such a thing.

> Fortunately, you can usually "rm -rf .git/svn" and git-svn will sort
> itself out on the next fetch.

Yeah, this has fixed it for me.  Thanks.