From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1NvCxb-00073e-Q5 for garchives@archives.gentoo.org; Fri, 26 Mar 2010 17:04:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F416FE09E8; Fri, 26 Mar 2010 17:03:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D1CA9E0A81 for ; Fri, 26 Mar 2010 17:03:58 +0000 (UTC) Received: from [192.168.0.3] (e179020033.adsl.alicedsl.de [85.179.20.33]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 1F4061B4162 for ; Fri, 26 Mar 2010 17:03:57 +0000 (UTC) Message-ID: <4BACE8FB.9050708@gentoo.org> Date: Fri, 26 Mar 2010 18:03:55 +0100 From: Sebastian Pipping User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.8) Gecko/20100310 Thunderbird/3.0.3 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 To: gentoo-portage-dev@lists.gentoo.org Subject: Re: [gentoo-portage-dev] Handling merge issues (on the case of prefix) References: <4BAC44E3.30104@gentoo.org> In-Reply-To: <4BAC44E3.30104@gentoo.org> X-Enigmail-Version: 1.0.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Archives-Salt: fa986925-d2db-41a5-bcb1-07753e214593 X-Archives-Hash: 4a355b3c5de1f01f19f665f02e050403 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