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 1QaYPT-0001Qp-Oj for garchives@archives.gentoo.org; Sat, 25 Jun 2011 19:20:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8C461C1F8; Sat, 25 Jun 2011 19:20:31 +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 9B91A1C1F8 for ; Sat, 25 Jun 2011 19:20:31 +0000 (UTC) Received: by ywm21 with SMTP id 21so2360664ywm.40 for ; Sat, 25 Jun 2011 12:20:31 -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=xUaAXtff/wLSRKRnNzq+kXZmjRw+dqCIMh11gt8wGSQ=; b=P2qwMu+q/b9jLjFmtkSPHVKPf1oCEGCfTW9Jz5tADNrlwmK0dcCmGAgGERAxICmV2W /1HJIXQHaP+2vm1oGisVJ5WSba0gx08kDLeZNXnlkJ0RVhwFo8iOFlLWyeTjPIRD0lOe 5RFqj8rV0mCYpTVaZ2X1VVYxgIwoiIRQHfY2c= 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=md8PRK4yDqIbvsyZUTwZWyCtQ0wfaGVFnegotO0KqwJEpFfUNQhSd8bqpHqZ5QXdhC 32COLL/9TVWAPFKoXXtp2qTICScU2u7en4vI7VfnqAI1WOXXS30J888uqknDjwNLgWe2 yRG3p1xsghbYfVZQMFmJPz/Pl3cWpQxXOCt48= Received: by 10.146.251.9 with SMTP id y9mr627325yah.22.1309029631051; Sat, 25 Jun 2011 12:20:31 -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 g2sm3780636ano.14.2011.06.25.12.20.29 (version=SSLv3 cipher=OTHER); Sat, 25 Jun 2011 12:20:30 -0700 (PDT) Sender: William Hubbs Received: by linux1 (sSMTP sendmail emulation); Sat, 25 Jun 2011 14:20:28 -0500 Date: Sat, 25 Jun 2011 14:20:28 -0500 From: William Hubbs To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] Differences between 2.x and 3.x, future merging Message-ID: <20110625192028.GB25328@linux1> Mail-Followup-To: gentoo-catalyst@lists.gentoo.org References: <4E062735.4050907@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="UugvWAfsgieZRqgk" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Archives-Salt: X-Archives-Hash: d8466c7b5af3baa226b420ecb41cde15 --UugvWAfsgieZRqgk Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Jun 25, 2011 at 02:26:33PM -0400, Matt Turner wrote: > On Sat, Jun 25, 2011 at 2:21 PM, Sebastian Pipping wro= te: > > Hello! > > > > > > The current process of copying changes from 2.x to 3.x or vice versa is > > suboptimal, especially with no recent merge commit around. > > > > I would like to start this thread to list and discuss differences > > between catalyst 2.x and 3.x so we can then decide what needs to be > > merged in which direction and then have a single branch soon (ideally) > > or at least two branches with clear and to-the-point diffs. > > > > Difference I have noticed (without searching) so far: > > > > =A0- Subarch "sh4aeb" is not supported on 3.x but 2.x > > > > =A0- Folder ./arch of 2.x is ./modules/catalyst/arch in 3.x > > > > Please add any differences you are aware of. =A0Many thanks! There is a way to add the changes from catalyst_2 to master using git; it will take someone who knows the code to make it happen, but you can use rebase like so: First, make sure that your copy of the repo is up to date and that you have a branch called catalyst_2 that tracks the catalyst_2 branch. Then do the following in the repo: git checkout master git rebase catalyst_2 Basically, this command will rework the master branch so that it contains the changes that are only there but not in the catalyst_2 branch. You will have to resolve conflicts, then use git add and git rebase--continue until that process is complete,. Once you are done, run "git pull --rebase" to pick up the newest changes in master, then git push to push everything back to master. A conflict will look something like: <<< HEAD code =66rom master here =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D code =66rom other branch here >>> catalyst_2 and you have to decide which piece of that code, or if it is parts of both pieces, to keep, and remove the rest of it including the <<< =3D=3D=3D and >>> lines. For more info about how rebase works look at man git-rebase. Also I learned a lot from http://progit.org/book and http://www.gitready.com. Who knows the code well enough to do this? Thanks, William --UugvWAfsgieZRqgk Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iEYEARECAAYFAk4GNPwACgkQblQW9DDEZTiQfwCfZM+tMxA5ana2zJSpZhpyp1Y2 thcAoJPyT058OsC8+kOf47MPl++pIS5t =NxYN -----END PGP SIGNATURE----- --UugvWAfsgieZRqgk--