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 1Nv2Tr-00014a-81 for garchives@archives.gentoo.org; Fri, 26 Mar 2010 05:53:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23F75E0886; Fri, 26 Mar 2010 05:52:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EFB04E0886 for ; Fri, 26 Mar 2010 05:52:38 +0000 (UTC) Received: from [192.168.22.10] (ip68-4-152-120.oc.oc.cox.net [68.4.152.120]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 77C851B4019 for ; Fri, 26 Mar 2010 05:52:38 +0000 (UTC) Message-ID: <4BAC4BC7.5030007@gentoo.org> Date: Thu, 25 Mar 2010 22:53:11 -0700 From: Zac Medico User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.9.1.8) Gecko/20100315 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=UTF-8 Content-Transfer-Encoding: 7bit X-Archives-Salt: 7f566dcd-98dd-40d1-8dbb-f463e0357ca2 X-Archives-Hash: 347b2bd2bf707bd939ad7cf1bafdbf54 Thanks, I've used your procedure to do that to the 2.1.7 branch and it seems to have worked well (git cherry now gives the expected result): http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=797fb70107834d0346e5201b7a9aaa5d36978c81 -- Thanks, Zac