git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Jarosch <thomas.jarosch@intra2net.com>
To: Deskin Miller <deskinm@umich.edu>
Cc: "Eric Wong" <normalperson@yhbt.net>,
	git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
	"Thomas Leonard" <talex5@gmail.com>,
	"Björn Steinbrink" <B.Steinbrink@gmx.de>
Subject: Re: [PATCH v3] git-svn: Make following parents atomic
Date: Tue, 16 Dec 2008 14:22:44 +0100	[thread overview]
Message-ID: <200812161422.58814.thomas.jarosch@intra2net.com> (raw)
In-Reply-To: <20081208233523.GB21675@hand.yhbt.net>

On Tuesday, 9. December 2008 00:35:23 you wrote:
> > To fix this, when we initialise the Git::SVN object $gs to search for
> > and perhaps fetch history, we check if there are any commits in SVN in
> > the range between the current revision $gs is at, and the top revision
> > for which we were asked to fill history.  If there are commits we're
> > missing in that range, we continue the fetch from the current revision
> > to the top, properly getting all history before using it as the parent
> > for the branch we're trying to create.
> >
> > Signed-off-by: Deskin Miller <deskinm@umich.edu>
>
> Looks good Deskin, thanks

This patch has a very nice side effect, it seems to fix a long standing 
problem with subversion imports. Here's the original report:
https://kerneltrap.org/mailarchive/git/2008/4/8/1377514/thread

Many of the 121 tags in my SVN tree were created by cvs2svn,
which often created tags by copying older revisions
of sub paths into the current tree. 

I've written a small script that checks out the same tag via git and SVN.
It runs a diff against those two trees and saves the result to a file
so I can manually check it. With git-svn from 1.6.0.5, the results are 
horrible: Over 30% of the tags didn't match the code in SVN.

With git-svn from 1.6.1rc3, my first two manual probes look very good.
Right now I'm reimporting the svn tree and will have the results
of the complete "checkout comparison" tomorrow.

Cheers,
Thomas

  reply	other threads:[~2008-12-16 13:24 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-07 16:06 [PATCH] git-svn: Make following parents atomic Deskin Miller
2008-12-07 16:10 ` [ANNOUNCE] git-svn-bugfix script (Re: [PATCH] git-svn: Make following parents atomic) Deskin Miller
2008-12-07 22:24 ` [PATCH] git-svn: Make following parents atomic Deskin Miller
2008-12-08  6:20   ` [PATCH v2] " Deskin Miller
2008-12-08  8:33     ` Junio C Hamano
2008-12-08 13:31       ` [PATCH v3] " Deskin Miller
2008-12-08 23:35         ` Eric Wong
2008-12-16 13:22           ` Thomas Jarosch [this message]
2008-12-22  8:41             ` Thomas Jarosch

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=200812161422.58814.thomas.jarosch@intra2net.com \
    --to=thomas.jarosch@intra2net.com \
    --cc=B.Steinbrink@gmx.de \
    --cc=deskinm@umich.edu \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=normalperson@yhbt.net \
    --cc=talex5@gmail.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).