From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: [DEV] New git workflow Date: Wed, 21 Mar 2012 10:01:06 +0100 Message-ID: <87ehsmwcod.fsf@Rainer.invalid> References: <87mx7cf613.fsf@altern.org> <4F69063F.40600@gmx.de> <874ntilxh9.fsf@Rainer.invalid> <4F699579.2090505@gmx.de> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([208.118.235.92]:56069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAHQ8-0007Tc-6J for emacs-orgmode@gnu.org; Wed, 21 Mar 2012 05:01:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SAHQ1-0006ht-Qp for emacs-orgmode@gnu.org; Wed, 21 Mar 2012 05:01:27 -0400 Received: from plane.gmane.org ([80.91.229.3]:38973) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAHQ1-0006hj-Jk for emacs-orgmode@gnu.org; Wed, 21 Mar 2012 05:01:21 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1SAHPz-0006vJ-KD for emacs-orgmode@gnu.org; Wed, 21 Mar 2012 10:01:19 +0100 Received: from pd9eb4420.dip.t-dialin.net ([217.235.68.32]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 21 Mar 2012 10:01:19 +0100 Received: from Stromeko by pd9eb4420.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 21 Mar 2012 10:01:19 +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 Simon Thum writes: > Whether multiple branches are involved depends mainly on what releases > one intends to maintain. The nice thing in the model is the gradual > maintenance: A really critical fix could see more backports than a > nicety. Yes. Bastien has to make that decision since he's the one doing the maintenance. > I like the goal maint is set to achieve, I'm just not convinced > regular merges are a good way to ensure it - after all, merges include > everything in a branch. If there are no doubts about that on your > side, I'm fine. It was intended as a solution to the problem of either not getting bugfixes for the latest release or having to live on bleeding edge. It was too shortlived to judge if it had achieved that goal and how satisfied people were with it. Bastien is now trying a three-branch model since he also needs to maintain org within Emacs(*). As long as it works for him it will work for us, I'd think. (*) This should provide similar benefits to users as maint was supposed to, albeit it may not be obvious to users on how to follow that branch. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Wavetables for the Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#BlofeldUserWavetables