Re: cvs2git conversion produces "spurious" commits in the history.

Etan Reisner <[email protected]> Wed, 10 Oct 2012 15:00:25 -0400
Newsgroups gmane.comp.version-control.subversion.cvs2svn.devel
Message-ID <CAM=quGUPyoppgzFjdxfnAdHa+GLpv5-_UhGxgpKtd9QoahDi3A@mail.gmail.com>
So I decided to look into git-filter-branch some more to see if I can
figure out how to make it fix my situation the way I want but unless
I'm missing something (which is entirely possible) I don't see how to
do it.

I tried using a simple graft to elide the extraneous commit but that
just moves the file changes to the next commit on the branch (which
isn't the correct commit). And so far I haven't seen how I'm going to
be able to transpose the commit contents to the correct commit with
filter-branch without doing (potentially) significant amounts of work.

The nice thing about the git-dump.dat editing (does this, not
git-blob.dat, really get to be gigabytes in size for some
repositories?) is that cvs2svn records both commits with the correct
file contents in the git-dump.dat file so removing the extraneous
commits is as simple as locating and removing the git-dump.dat entry
for them entirely.

(Feel free to tell me to take this somewhere else since at this point
this isn't really a cvs2svn question anymore.)

    -Etan

------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1667&dsMessageId=3019572

To unsubscribe from this discussion, e-mail: [[email protected]].