From: Seth Falcon <sethfalcon@gmail.com>
To: Eric Wong <normalperson@yhbt.net>
Cc: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: Re: git-svn failure when symlink added in svn
Date: Mon, 30 Apr 2007 07:43:46 -0700 [thread overview]
Message-ID: <m24pmxrkgt.fsf@ziti.local> (raw)
In-Reply-To: <20070429182649.GD12375@untitled> (Eric Wong's message of "Sun, 29 Apr 2007 11:26:49 -0700")
Eric Wong <normalperson@yhbt.net> writes:
> Seth Falcon <sethfalcon@gmail.com> wrote:
>> Eric: is there any way to undo some of the svn revs that have been
>> retrieved using git-svn fetch and then refetch them?
> Assuming you're not using something crazy like noMetadata, you can just
> use update-ref on the remote heads to the last known good revisions and
> remove the associated .rev_db files.
>
> Otherwise you'll have to delete entries from the .rev_db files, the
> format is one line per-revision, the revision is the line number of the
> file.
Hmm, not sure I understood. Here's what I tried:
I'm tracking two branches via git-svn. For each, I used git log
remotes/<branch> to find a revision that I expect to be ok and noted
the sha1. Then I did:
git-update-ref remotes/git-svn a27b11c1
and similar, but with different sha1 for the other branch. Next I
removed the .rev_db* files (there was one for each svn branch) and
tried doing git-svn fetch. This seemed to rebuild the .rev_db, but
eventually I ended up with:
Done rebuilding .git/svn/git-svn/.rev_db.00db46b3-68df-0310-9c12-caf00c1e9a41
M src/<somepath>
M src/<another>
Incomplete data: Delta source ended unexpectedly at /Users/seth/scm/bin/git-svn line 2982
And if I rerun git svn fetch, I get:
Index mismatch: 9c07a6009029e4a1d834ff126f705c4db3c4bce7 != 67dc53678f759c52a93a281f13fadb08799f86b2
rereading 0f12c8c092600c8a3337ec35d153d3a76ce2329d
M src/<somepath>
M src/<another>
Incomplete data: Delta source ended unexpectedly at /Users/seth/scm/bin/git-svn line 2982
[where <somepath> and <another> are the same in both cases]
Did I miss a step or misunderstand how to undo? What's strange is
that if I do git show 0f12c8c, I see a patch that is looks like it came
from a fetch using the my broken version of git-svn -- do I need to
clear out objects before refetching?
Thanks,
+ seth
next prev parent reply other threads:[~2007-04-30 14:44 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-14 6:41 git-svn failure when symlink added in svn Seth Falcon
2007-04-14 20:10 ` Eric Wong
2007-04-16 3:13 ` Seth Falcon
2007-04-26 23:07 ` Alexander Klink
2007-04-27 18:03 ` Linus Torvalds
2007-04-28 13:02 ` Alexander Klink
2007-04-28 16:54 ` Seth Falcon
2007-04-28 17:31 ` Junio C Hamano
2007-04-28 18:13 ` Seth Falcon
2007-04-28 18:34 ` Junio C Hamano
2007-04-28 21:15 ` Seth Falcon
2007-04-28 22:43 ` Junio C Hamano
[not found] ` <m2irbfqlze.fsf@ziti.local>
2007-04-29 18:26 ` Eric Wong
2007-04-30 14:43 ` Seth Falcon [this message]
2007-04-30 15:43 ` Eric Wong
2007-05-01 17:49 ` Seth Falcon
2007-04-29 18:31 ` Eric Wong
2007-04-29 21:01 ` Junio C Hamano
2007-04-29 22:21 ` Eric Wong
2007-04-30 0:24 ` Alexander Klink
2007-04-30 5:08 ` Junio C Hamano
2007-04-30 6:31 ` Eric Wong
2007-04-30 14:33 ` Seth Falcon
2007-05-01 20:53 ` Alexander Klink
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=m24pmxrkgt.fsf@ziti.local \
--to=sethfalcon@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=normalperson@yhbt.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.