All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Wong <normalperson@yhbt.net>
To: Pascal Obry <pascal@obry.net>
Cc: Avery Pennarun <apenwarr@gmail.com>,
	adambrewster@gmail.com, git list <git@vger.kernel.org>
Subject: Re: git-svn problem with v1.6.5
Date: Wed, 11 Nov 2009 12:22:01 -0800	[thread overview]
Message-ID: <20091111202201.GA10351@dcvr.yhbt.net> (raw)
In-Reply-To: <4AFB1756.7090708@obry.net>

Pascal Obry <pascal@obry.net> wrote:
> Avery,
>
>> Well, that's bad news.  Does "git log --all --parents | grep
>> d2cf08bb67e4b7da33a250127aab784f1f2f58d3" reveal any places that refer
>> to it?
>
> No.

Weird...

>> It sounds a bit like your git-svn thinks something maps on to that
>> commit id, but a previous 'git gc' or something has thrown it away.
>> However, that doesn't explain why earlier git versions don't have this
>> problem.
>
> Maybe, but that would be a quite annoying bug!

>> If you retrieve the latest version of git and then git revert the
>> above commit, does that fix the problem, at least?
>
> I cannot, this does not revert cleanly and I don't know how to properly  
> resolve this conflict. I'm no Perl expert!
>
> But reverting using the version just before fixes this problem.

That should rule out filesystem corruption...

>> Is it possible you have some weird branches outside of the
>> refs/remotes tree (either in .git itself, or in .git/refs/*) that you
>> forgot about, and which the new version of git-svn is finding somehow?
>
> I do not see something under .git/refs/* (only empty directories).
>
> The project has been imported using something like this:
>
>  $ git svn clone --prefix=svn/ svn+ssh://server/path \
> 	--revision=580:HEAD \
> 	--trunk=trunk/project \
> 	--tags=tags/project \
> 	--branches=branches/project \
> 	--branches="branches/global/*/project" project

It looks like you didn't use any of the weird[1] options that make it
unsafe to clobber the rev_maps.  Can you try removing all the .rev_map.*
files in $GIT_DIR/svn and running "git svn fetch" to rebuild them?

[1] --no-metadata, --use-svm-props
-- 
Eric Wong

  reply	other threads:[~2009-11-11 20:22 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-10 22:23 git-svn problem with v1.6.5 Pascal Obry
2009-11-10 22:28 ` Avery Pennarun
2009-11-11 10:28   ` Pascal Obry
2009-11-11 19:41     ` Avery Pennarun
2009-11-11 19:58       ` Pascal Obry
2009-11-11 20:22         ` Eric Wong [this message]
2009-11-11 20:34           ` Eric Wong
2009-11-11 21:55             ` Pascal Obry
2009-11-11 22:44               ` Eric Wong
2009-11-12  6:39                 ` Pascal Obry
2009-11-12  7:11                   ` Eric Wong
2009-11-12  8:11                     ` Pascal Obry
2009-11-12  9:03                       ` Pascal Obry
2009-11-12  9:35                         ` Eric Wong
2009-11-12 10:00                           ` Pascal Obry
2009-11-11  4:02 ` Sam Vilain
2009-11-11  8:11   ` Pascal Obry

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

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

  git send-email \
    --in-reply-to=20091111202201.GA10351@dcvr.yhbt.net \
    --to=normalperson@yhbt.net \
    --cc=adambrewster@gmail.com \
    --cc=apenwarr@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=pascal@obry.net \
    /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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.