From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Dehennin Subject: Re: [DEV] New git workflow Date: Sat, 24 Mar 2012 12:05:53 +0100 Message-ID: <87fwcyqmwe.fsf@hati.baby-gnu.org> References: <87mx7cf613.fsf@altern.org> <4F69063F.40600@gmx.de> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([208.118.235.92]:47113) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBOnU-0004Uu-Ok for emacs-orgmode@gnu.org; Sat, 24 Mar 2012 07:06:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SBOnS-0001bZ-N2 for emacs-orgmode@gnu.org; Sat, 24 Mar 2012 07:06:12 -0400 Received: from zion.baby-gnu.net ([82.225.168.180]:57280 helo=zion.baby-gnu.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBOnS-0001b0-FO for emacs-orgmode@gnu.org; Sat, 24 Mar 2012 07:06:10 -0400 Received: from hati.asgardr.info ([192.168.1.2] helo=hati.baby-gnu.org) by zion.baby-gnu.org with esmtp (Exim 4.77) (envelope-from ) id 1SBOnB-0001w7-Nq for emacs-orgmode@gnu.org; Sat, 24 Mar 2012 12:05:53 +0100 In-Reply-To: <4F69063F.40600@gmx.de> (Simon Thum's message of "Tue, 20 Mar 2012 23:35:43 +0100") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Simon Thum writes: > Hi all, Hello, [...] > Many projects use the IMO more sane model of release branches (or > maintenance branches, if you prefer) for major releases. Minor ones > are tagged on those branches, and back-porting critical fixes is much > cleaner: Fixes and development go to master, fixes which should be > back-ported are cherry-picked onto the release branches. When desired, > a new release is tagged. Releases only come from release branches, of > course. It seems that one problem with cherry-picking is the tracking of what is in which branch and from where it comes. I'm not a git neither DVCS guru, but daggyfixes[1][2][3] is saner than cherry-picking. My 2=C2=A2. Regards. Footnotes:=20 [1] http://mercurial.selenic.com/wiki/DaggyFixes [2] http://wiki.monotone.ca/DaggyFixes/ [3] http://stackoverflow.com/questions/2922652/git-is-there-a-way-to-figur= e-out-where-a-commit-was-cherry-picked-from =2D-=20 Daniel Dehennin R=C3=A9cup=C3=A9rer ma clef GPG: gpg --keyserver pgp.mit.edu --recv-keys 0x6A2540D1 --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iEYEAREKAAYFAk9tqpEACgkQb97L6l6P4FsuBwCglPNn6c84cV/py4BxUMq2YjOx sAIAmQHyTyvkUDhoyo7n9BTbQAM/sasL =QCSW -----END PGP SIGNATURE----- --=-=-=--