From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9A5CE1381F3 for ; Mon, 17 Jun 2013 11:44:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D78CEE0964; Mon, 17 Jun 2013 11:44:36 +0000 (UTC) Received: from mail-pd0-f174.google.com (mail-pd0-f174.google.com [209.85.192.174]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2D785E077A for ; Mon, 17 Jun 2013 11:44:35 +0000 (UTC) Received: by mail-pd0-f174.google.com with SMTP id 10so2700153pdc.19 for ; Mon, 17 Jun 2013 04:44:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:sender:to:references:in-reply-to:subject:date:message-id :mime-version:content-type:content-transfer-encoding:x-mailer :thread-index:content-language:x-gm-message-state; bh=q/p0FT/BNSJqLmoUy+0rbTHzjlq9NA9QzmxCBUdTv6k=; b=jwDhhetP9889IYf2mUbRFMxXuLcrK9mlwkGO8eQEp54/t2rB1SqDE6RBVopKRoUjhJ RvjaK3h1H6zZpWunvUQySdOFYpyTzEaew7Y56S4k/A8DXIjG8Z2aMTVaLi/b3FXfYqDS soLhBum+JttHF9S3+1wGY9hX/leaQtF1PebaBLGhNz4VM7TUBHXlTViLu4DSATaIPU32 npnNN7Ui9hgCBTrTIwv2RqYLpZOgSbtaROGVyIZV3L/VGChe7fth4g9Pnzj/WoLJipDV YmeRvm8d7X3Uw9UcpbmASQyBP/BpndCYM+MxUsLNjC33hcGkToFZES7LUN2lH9yWOhoP fFxw== X-Received: by 10.68.213.231 with SMTP id nv7mr12785260pbc.70.1371469474862; Mon, 17 Jun 2013 04:44:34 -0700 (PDT) Received: from weaksauce (malth.us. [75.147.143.249]) by mx.google.com with ESMTPSA id tq8sm13568908pbc.30.2013.06.17.04.44.33 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 17 Jun 2013 04:44:33 -0700 (PDT) From: Sender: Greg Turner To: References: <201306170921.41945.redlizard@redlizard.nl> <20130617075311.GU14072@gentoo.org> <201306171000.24619.redlizard@redlizard.nl> In-Reply-To: <201306171000.24619.redlizard@redlizard.nl> Subject: RE: [gentoo-portage-dev] [PATCH 0/3] Add cross-prefix support Date: Mon, 17 Jun 2013 04:44:25 -0700 Message-ID: <031301ce6b50$05787860$10696920$@malth.us> 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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Mailer: Microsoft Outlook 15.0 Thread-Index: AQG5i1x5PQr9SonWabgv0KL/KgUlEwJ8aWOMAw1gOcWZNzHv8A== Content-Language: en-us X-Gm-Message-State: ALoCoQnvZx/q0cG893/RC18siKqb/YXw6r8y063sBltA0povxLSMzQBGtSWoCcYSRJdt9HOjiuP0 X-Archives-Salt: 7d7ea6c3-f0af-4a6d-ba72-f00d35ffbd91 X-Archives-Hash: dc2f48ddf57d2b93f4d16343bf8defb6 On Mon, 17 Jun 2013, at 01:00, Ruud Koolen thusly quipped: > I also didn't test whether these patches work on the prefix-portage = branch. I > don't really know much far prefix-portage diverges from mainline = portage, so I > don't know whether I should expect it to just work. Prefix portage is literally a branch -- in the git sense of the term -- = of the regular portage git repo on g.o.g.o. So, a good place to start = is to check out that branch and see if your diffs apply. When I am = doing work that I expect to flow into both branches, I typically = maintain a "master" and prefix_master private branch, with the latter = set to pull from origin/prefix, i.e.: [remote "origin"] fetch =3D +refs/heads/*:refs/remotes/origin/* url =3D /usr/src/repos/git/portage.git [branch "master"] remote =3D origin merge =3D refs/heads/master [branch "prefix_master"] remote =3D origin merge =3D refs/heads/prefix [branch "cygwin_master"] remote =3D . merge =3D refs/heads/prefix_master Guess I didn't use very consistent naming. The basic plan is, with the = arrows representing flows of information to the right-hand side on "git = pull": [upstream repo] -> /usr/src/repos/git/portage.git -- a bare, vanilla = clone of upstream [portage.git/master] -> master (which is a private branch with = upstreamable patches) [portage.git/prefix] -> prefix_master (also a private branch, analogous = to master, with forward-ported versions of my patches in master; = upstreamable to "origin/prefix") [prefix_master] -> cygwin (an experimental prefix portage "fork", = downstream to all of the above) Usually I cherry-pick patches from master into prefix_master and perform = up any merges at that phase, and then just "git checkout cygwin ; git = pull" to merge those (vs.-vanilla-prefix-portage) patches into my = experimental prefix portage fork. I do that way because my eyes simply glaze over when I try to read that = whole business about prune-and-graft in git merge --help; however if you = end up with a huge pile of patches to merge, the prune-graft approach = should work perfectly fine to move deltas from master to prefix-master. -gmt