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 1SaUEU-0003KO-LQ for garchives@archives.gentoo.org; Fri, 01 Jun 2012 15:57:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A217DE0724; Fri, 1 Jun 2012 15:57:28 +0000 (UTC) Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by pigeon.gentoo.org (Postfix) with ESMTP id C4A2CE06FD for ; Fri, 1 Jun 2012 15:56:44 +0000 (UTC) Received: by wibhn6 with SMTP id hn6so635790wib.10 for ; Fri, 01 Jun 2012 08:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=I/ScCLfd9YlTopfd9c4LEJ+xCtrxi492st0v5p+pGHQ=; b=Z4YVfgx8YC4FF+BqS2BcVAQLVV4ntJcC7b8fg/hj5xrsJcJpddyUWNWbMeeBkLI2WK vRKSqTzsljTElsqKrF/9RSRHvxxvkOXxD4cn5g4x8zacGH8J5btFUTx5gHf4hUhDH0ny OmTomhjYeai9h/5ttk675bKOVxmJWy5je3bG1SBqZ6vSAS4+1/fPJPowsi74e7B2B79y RbmYBqe6G8nd6YoLgVydEhMyWk542PM5w5f7gEje63ZbYI+ODOQCMhDMBkR8wLl6drn+ F3btdib2PYl5yEbZjd2YUfQARGKhE6NE94pwCmmLXCAMyp2ugV3xpy3ZiDuq3QHpdQc4 qn0Q== Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Received: by 10.216.144.216 with SMTP id n66mr2382675wej.107.1338566203806; Fri, 01 Jun 2012 08:56:43 -0700 (PDT) Received: by 10.194.60.167 with HTTP; Fri, 1 Jun 2012 08:56:43 -0700 (PDT) In-Reply-To: References: <20120531195450.GA24805@linux1> <20120531205714.GA25021@linux1> <20120601132545.GA2416@nicolas-desktop> Date: Sat, 2 Jun 2012 03:56:43 +1200 Message-ID: Subject: Re: [gentoo-dev] Re: Portage Git migration - clean cut or git-cvsserver From: Kent Fredric To: gentoo-dev@lists.gentoo.org Cc: Nicolas Sebrecht Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 901ef101-71de-4151-8223-1ed372090630 X-Archives-Hash: 5096c8b487faccd965d945fcb72c7279 On 2 June 2012 03:39, Rich Freeman wrote: > On Fri, Jun 1, 2012 at 9:25 AM, Nicolas Sebrecht wro= te: >> So, like explained before your concern is clearly out of the current >> discussion. Importing commit history from Overlays is not supported and >> will probably never be. Gentoo doesn't forces (and doesn't want to) >> overlays maintainers to use Git. > > I'm not sure that git even supports this, unless the overlay is a > complete clone of the entire gentoo-x86.git repository. > > I think the way git operations work is by finding common parents in > the history of two heads, and then moving forward from there. =C2=A0If yo= u > have two completely different repositories then they never will have a > common parent. You can however merge dissimilar histories with no common parents if you know what you're doing. It does warn you, but it still lets you do it. > Plus, even if it did work, to rebase the overlay on the gentoo-x86 > repository you'd have to import the full gentoo-x86 tree into it. > Then you'd have to push EVERYTHING in your overlay into gentoo-x86. =C2= =A0I > don't think you can just push individual files from one tree to > another. Yeah, selectively pulling in files with histories however is hard, I've occasionally been fussed enough to create temporary copies of branches, and then iterate over their history so the history is reduced to changes only for a small selection of files, but its largely lots of work, and I can't remember how to do it every time I go to do it -_- Its reasonably straight forward to cherry-pick commits in though. > From what I've seen the various methods out there which do involve > moving only part of one branch into another basically involve a LOT of > history manipulation or are really no different than just copying the > files into the branch and adding them, losing all history in the > process. > > I'm not sure how important all that history preservation actually is - > the overlay would still possess it. =C2=A0If we did want to preserve it > then the only practical option I see is to have the overlay start out > as a clone of gentoo-x86 and keep around all the non-overlay packages, > which then means that anybody using the overlay will get all those old > gentoo-x86 packages as part of their portage tree. =C2=A0Plus you still > have the rebase+gpg-signatures=3Dfail issue. > > Rich > Myself, I'd be inclined to do something like this: 1. Have an integration branch on gx86 2. Select a package or packages to migrate to gx86 from an overlay 3. create a branch in the overlay that only contains the history with regard to those packages. 4. copy the branch to a local checkout of gx86, and then rebase it on top of the integration branch 5. then delete it from the overlay. But the exact part of "Create a branch that contains only the history of those packages" is the part I need to get down to an art . --=20 Kent perl -e=C2=A0 "print substr( \"edrgmaM=C2=A0 SPA NOcomil.ic\\@tfrken\", \$_= * 3, 3 ) for ( 9,8,0,7,1,6,5,4,3,2 );" http://kent-fredric.fox.geek.nz