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 1RYm2f-0002Tw-7I for garchives@archives.gentoo.org; Thu, 08 Dec 2011 22:02:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE2DC21C1F2 for ; Thu, 8 Dec 2011 22:02:12 +0000 (UTC) Received: from mail-gy0-f181.google.com (mail-gy0-f181.google.com [209.85.160.181]) by pigeon.gentoo.org (Postfix) with ESMTP id 6417421C191 for ; Thu, 8 Dec 2011 21:47:40 +0000 (UTC) Received: by ghbg18 with SMTP id g18so2248226ghb.40 for ; Thu, 08 Dec 2011 13:47:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:date:from:to:subject:message-id:mail-followup-to:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=1Eqr1GF2xUQzkmnNjulK3caNdpXEeNDK5LNV8dG+PNA=; b=iDtr0OCGa0el4oN9MDhbFFCIUFD+pPNddw7/WG0ncWkKV94epuXjm7N2OOfmd1GCye zLOoV7Jx7ud8frHITTgWK17jilpR+g4qxjecY133Thq3nHIgFc4ue3DJ8l0+0ZaqLpAb qEmecw3Efrcie6/U6yi8NIUvohqm6aPrJcNv0= Received: by 10.236.76.136 with SMTP id b8mr8223630yhe.9.1323380859598; Thu, 08 Dec 2011 13:47:39 -0800 (PST) Received: from linux1 (cpe-76-187-77-158.tx.res.rr.com. [76.187.77.158]) by mx.google.com with ESMTPS id d6sm17853853anm.16.2011.12.08.13.47.37 (version=SSLv3 cipher=OTHER); Thu, 08 Dec 2011 13:47:38 -0800 (PST) Sender: William Hubbs Received: by linux1 (sSMTP sendmail emulation); Thu, 08 Dec 2011 15:42:40 -0600 Date: Thu, 8 Dec 2011 15:42:40 -0600 From: William Hubbs To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] rfc: merging catalyst git branches Message-ID: <20111208214240.GA10360@linux1> Mail-Followup-To: gentoo-catalyst@lists.gentoo.org References: <20110627044433.GA9772@linux1> <20111208194623.GA2416@linux1> <4EE11E9E.4000809@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="2oS5YaxWCcQjTEyO" Content-Disposition: inline In-Reply-To: <4EE11E9E.4000809@gentoo.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Archives-Salt: d2dbcf20-7045-496a-845c-9706a0811771 X-Archives-Hash: e4f1e6b4bf60164076550a4bb75f9dcf --2oS5YaxWCcQjTEyO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Dec 08, 2011 at 09:31:26PM +0100, Sebastian Pipping wrote: > On 12/08/2011 08:46 PM, William Hubbs wrote: > > If no one objects, I will look into doing this next week; the catalyst_2 > > code should move to master since there doesn't appear to be any work > > going on for releasing catalyst 3. > >=20 > > Comments? >=20 > Sounds like you are going for complete replacement. Good move. >=20 >=20 > The cleanest way to do this this in Git may be: >=20 > # git checkout master > # git merge -s theirs catalyst_2 >=20 > Haven't tested it though. I checked it out with the folks on #git, and they are recommending that I rename catalyst_2 to master. I was given a series of commands to do this. The down side is that this will cause a forced update, so everyone will have to re-clone the repository. The target time I am considering for this is Monday, Dec 11, 0:00 utc. What that means is, everyone needs to have their changes pushed by then, then I'll make the change and send out an email here once I'm done. Then, you will have to re-clone your repositories. Any comments? Thanks, William --2oS5YaxWCcQjTEyO Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iEYEARECAAYFAk7hL1AACgkQblQW9DDEZThNaACfepJJFNjIPe1F3oFtSs4Hcerg P5UAn3hTQlR0JER6/iX/Ca+SJZldIeN9 =Rgzj -----END PGP SIGNATURE----- --2oS5YaxWCcQjTEyO--