public inbox for gentoo-portage-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Sebastian Pipping <sping@gentoo.org>
To: gentoo-portage-dev@lists.gentoo.org
Subject: Re: [gentoo-portage-dev] Handling merge issues (on the case of prefix)
Date: Fri, 26 Mar 2010 18:03:55 +0100	[thread overview]
Message-ID: <4BACE8FB.9050708@gentoo.org> (raw)
In-Reply-To: <4BAC44E3.30104@gentoo.org>

On 03/26/10 06:23, Sebastian Pipping wrote:
> Consequences
> ------------
> So Git relies on the existence of merge commits to detect what has been
> merged already.  Creating all these merge commits is a tough job for a
> conversion tool (like svn2git) as it would have to distinguish between
> cases where just a few commist have been cherry-picked over and cases
> where all previous commits have made it over.
> 
> So the portage Git history does not have merge commits at these points
> but plain single-parent commits.

I was wondering if this could be something that git-svn can do better
than svn2git: after all what does git-svn do in these 100 minutes taking
longer than svn2git?

So I ran a git-svn conversion again but it seems it does no better:

  # git cherry -v prefix master | wc -l
  7988

So that looks like about the same.



Sebastian



      parent reply	other threads:[~2010-03-26 17:04 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-26  5:23 [gentoo-portage-dev] Handling merge issues (on the case of prefix) Sebastian Pipping
2010-03-26  5:53 ` Zac Medico
2010-03-26 17:03 ` Sebastian Pipping [this message]

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=4BACE8FB.9050708@gentoo.org \
    --to=sping@gentoo.org \
    --cc=gentoo-portage-dev@lists.gentoo.org \
    /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