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 <gentoo-dev+bounces-52130-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1SaXRf-0005iB-10
for garchives@archives.gentoo.org; Fri, 01 Jun 2012 19:23:35 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 25B94E0527;
Fri, 1 Jun 2012 19:23:19 +0000 (UTC)
Received: from mail-ob0-f181.google.com (mail-ob0-f181.google.com [209.85.214.181])
by pigeon.gentoo.org (Postfix) with ESMTP id 1D438E0509
for <gentoo-dev@lists.gentoo.org>; Fri, 1 Jun 2012 19:22:27 +0000 (UTC)
Received: by obbuo19 with SMTP id uo19so3601463obb.40
for <gentoo-dev@lists.gentoo.org>; Fri, 01 Jun 2012 12:22:27 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20120113;
h=sender:date:from:to:subject:message-id:mail-followup-to:references
:mime-version:content-type:content-disposition:in-reply-to
:user-agent;
bh=QAHn1WNYhMXluaQO4H1v1w7ZbKC5B8lUOibZOU2XHyM=;
b=rZPx3I0Syl/zckG/nWAMFVME7YbTPFAH8xwHxlBlkOTdbbT+4O3W9HQwA18zIbC1Fh
efdtUgmgrFX+MMmHPCg/qqwpKjdj02s20m+sYaaQahqsQqV9t3OlsJdpHH/6r5jMaO5X
hCQc3ES15CX0pmmEyej7M1JW9lOpaH57NaNumH8D4TiQY9Y2HMN0c2K1lK0fHYvstWtC
pzxOSn/8UWNP0Uf7A9zgQmSl4BiIpBGWX3lATgJSTRLgeOmH01HoxOtwO2N2/oUZ9RBo
sxYlAF7ZC3LUZhwNr0lRbHPDUqAOAeFoVsl2qvVXfdN+CLVb+CJd5P5ZgFCZi2otUhhJ
NbIA==
Received: by 10.182.167.104 with SMTP id zn8mr3726459obb.62.1338578547534;
Fri, 01 Jun 2012 12:22:27 -0700 (PDT)
Received: from linux1 (cpe-76-187-77-158.tx.res.rr.com. [76.187.77.158])
by mx.google.com with ESMTPS id o4sm1739440oef.11.2012.06.01.12.22.25
(version=SSLv3 cipher=OTHER);
Fri, 01 Jun 2012 12:22:27 -0700 (PDT)
Sender: William Hubbs <w.d.hubbs@gmail.com>
Received: by linux1 (sSMTP sendmail emulation); Fri, 01 Jun 2012 14:22:25 -0500
Date: Fri, 1 Jun 2012 14:22:25 -0500
From: William Hubbs <williamh@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Subject: Re: [gentoo-dev] Re: Portage Git migration - clean cut or
git-cvsserver
Message-ID: <20120601192225.GA25207@linux1>
Mail-Followup-To: gentoo-dev@lists.gentoo.org
References: <CAKmKYaBPFXtgPVtY4UQvnD1AjN0oYRz0cDLmZuGzPNNSGnS9YQ@mail.gmail.com>
<robbat2-20120531T163959-415201853Z@orbis-terrarum.net>
<CAGfcS_mSMrS5oYJL3+v2qiCN=efNPestH3je2L7fLvmch2sdVQ@mail.gmail.com>
<robbat2-20120531T190511-495360338Z@orbis-terrarum.net>
<20120531195450.GA24805@linux1>
<pan.2012.05.31.20.26.58@cox.net>
<20120531205714.GA25021@linux1>
<pan.2012.06.01.12.57.10@cox.net>
<20120601154548.GA10637@linux1>
<robbat2-20120601T163252-365612100Z@orbis-terrarum.net>
Precedence: bulk
List-Post: <mailto:gentoo-dev@lists.gentoo.org>
List-Help: <mailto:gentoo-dev+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-dev+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-dev+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-dev.gentoo.org>
X-BeenThere: gentoo-dev@lists.gentoo.org
Reply-to: gentoo-dev@lists.gentoo.org
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
protocol="application/pgp-signature"; boundary="HcAYCG3uE/tztfnV"
Content-Disposition: inline
In-Reply-To: <robbat2-20120601T163252-365612100Z@orbis-terrarum.net>
User-Agent: Mutt/1.5.21 (2010-09-15)
X-Archives-Salt: 20506e72-4a9f-4800-be7e-196b39805b9a
X-Archives-Hash: 135768cb4099f6a603fd7b56d78d6f90
--HcAYCG3uE/tztfnV
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Fri, Jun 01, 2012 at 04:33:35PM +0000, Robin H. Johnson wrote:
> On Fri, Jun 01, 2012 at 10:45:48AM -0500, William Hubbs wrote:
> > Overlays are completely separate repositories. There is nothing stopping
> > an overlay from using git right now even if the main tree isn't using
> > git. They just work in their git repositories until they are ready to
> > commit something to the main tree, then they move the changes to the
> > main tree.
> What about overlay repositories that elect to be a branch of the main
> tree via git?
>=20
> Do we call that forbidden usage?
No, it just would mean that they have to know how to rebase their
changes on master before they commit.
They would clone the main tree to their overlay location, then make a
kde branch in their location. That branch would be where they did their
work and they would keep master in sync with the main tree (upstream) by
running git pull.
To merge the overlay changes into the master, a developer would use a
git remote to add the kde overlay to his tree, add a kde branch that
tracked the remote kde branch, rebase that on current master, merge it
into master to create a fast-forward merge then push.
I think that probably sounds more complicated than it is, so let me know
if you need clarification.
William
--HcAYCG3uE/tztfnV
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
iEYEARECAAYFAk/JFnEACgkQblQW9DDEZTi9rwCeN8v4UgHrqqI+YdMXRzVH6qcv
NoEAn2s++OcZ7ucmbzUEL7gAGnEiDuTT
=Cirb
-----END PGP SIGNATURE-----
--HcAYCG3uE/tztfnV--