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 1Qaky9-0006mL-6l for garchives@archives.gentoo.org; Sun, 26 Jun 2011 08:45:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D1A81C03A; Sun, 26 Jun 2011 08:45:10 +0000 (UTC) Received: from mail-yw0-f53.google.com (mail-yw0-f53.google.com [209.85.213.53]) by pigeon.gentoo.org (Postfix) with ESMTP id 046C71C03A for ; Sun, 26 Jun 2011 08:45:09 +0000 (UTC) Received: by ywm21 with SMTP id 21so2517899ywm.40 for ; Sun, 26 Jun 2011 01:45:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:date:from:to:subject:message-id :mail-followup-to:references:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=m+pFOFV+FZ4W4IFPITJKQbQG76m9ZFwp8cLfsPKwe38=; b=iBMBCijruNwCmtw4rD/+tj6p2ThvxF84wU/62s6bXU0GcBDfogLOZJWE5qqQDIR/dR G3wHPSg0cvI4N1CGqsBYhPvBjneHMn0xIFfdjvwilP5Wvh1Ejs6i30Iba4Sc3I4n+v0U mff3eR5+OJ6BXOLk03b4xJ77jRFsTyfNJG2AY= DomainKey-Signature: a=rsa-sha1; c=nofws; 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; b=HMI1O1rschEo3prNEjgbwCm2rv/irAX/cFsPX4XlbI0gwPLWktBK+7D/7EUKBMjHLG 8qfuPukHnNJixc0+sL/WMi3FYEswM1GC5BS1lOqpigwUyE1i1/+7WENA+6xQSvH0XgRW lxAyu/Ldk7fkxHgRCoM6IIg67+gukNkh12eZM= Received: by 10.151.144.3 with SMTP id w3mr5300588ybn.380.1309077909334; Sun, 26 Jun 2011 01:45:09 -0700 (PDT) Received: from linux1 (cpe-76-187-76-173.tx.res.rr.com [76.187.76.173]) by mx.google.com with ESMTPS id i14sm3890153ann.34.2011.06.26.01.45.07 (version=SSLv3 cipher=OTHER); Sun, 26 Jun 2011 01:45:08 -0700 (PDT) Sender: William Hubbs Received: by linux1 (sSMTP sendmail emulation); Sun, 26 Jun 2011 03:45:07 -0500 Date: Sun, 26 Jun 2011 03:45:07 -0500 From: William Hubbs To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] master rebase of catalyst 2 Message-ID: <20110626084507.GA7614@linux1> Mail-Followup-To: gentoo-catalyst@lists.gentoo.org References: <20110626050301.GD6710@linux1> <4E06D105.6070508@gentoo.org> <20110626075619.GA7226@linux1> 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="3MwIy2ne0vdjdPXF" Content-Disposition: inline In-Reply-To: <20110626075619.GA7226@linux1> User-Agent: Mutt/1.5.21 (2010-09-15) X-Archives-Salt: X-Archives-Hash: 76800684bc9a1bd7f62b60f4af1443d3 --3MwIy2ne0vdjdPXF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline All, it is safe to forget about the branch I was talking about with over 100 commits on it. Git has some tools which can help us figure out which commits need to go to master from catalyst_2. First, make sure your repository is up to date. Once that is done, one thing you can do is look at the commits on catalyst_2 by exporting them to patches. To do this, check out the catalyst_2 branch and run this command: git format-patch master That will turn all of the commits on catalyst_2 into patches and save them in your current directory. It is also possible to let git tell you which commits it thinks are already on master by running this command while you are on the catalyst_2 branch. git cherry master This produces a list of commit hashes preceeded by '+' or '-'. In this example, the commits that start with '+' are the ones git thinks are NOT in the master branch. At that point it will be a matter of looking at each commit manually, deciding if it needs to be ported to master and making the appropriate change on master as well. Do you have any thoughts about how we can go about forward porting these changes from catalyst_2 to master? Thanks, William --3MwIy2ne0vdjdPXF Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iEYEARECAAYFAk4G8ZMACgkQblQW9DDEZTisHgCgsoaXXh+S8D6UJAWhTZsFT4pV mfAAn0z0q8YCIqon2N/RQ6xtw/tx5VPw =r2ux -----END PGP SIGNATURE----- --3MwIy2ne0vdjdPXF--