From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastien Subject: Re: Should maint branch be deprecated? Date: Tue, 20 Mar 2012 01:58:26 +0100 Message-ID: <87haxkf5ql.fsf@gnu.org> References: <87pqc8dw2u.fsf@Rainer.invalid> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([208.118.235.92]:49508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9nNw-0006QM-9b for emacs-orgmode@gnu.org; Mon, 19 Mar 2012 20:57:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S9nNt-0004cb-Pf for emacs-orgmode@gnu.org; Mon, 19 Mar 2012 20:57:11 -0400 Received: from mail-wg0-f49.google.com ([74.125.82.49]:41485) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9nNt-0004cB-G0 for emacs-orgmode@gnu.org; Mon, 19 Mar 2012 20:57:09 -0400 Received: by wgbdr1 with SMTP id dr1so863459wgb.30 for ; Mon, 19 Mar 2012 17:57:07 -0700 (PDT) In-Reply-To: <87pqc8dw2u.fsf@Rainer.invalid> (Achim Gratz's message of "Tue, 20 Mar 2012 00:12:25 +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: Achim Gratz Cc: emacs-orgmode@gnu.org Hi Achim, Achim Gratz writes: > It seemed to work well until Bastien made a mistake because the release > script wasn't properly adapted and digged the hole deeper while trying > to fix it (too) quickly. Maint is good again, master still needs a few > more touches. This should be all right now -- thanks again! >> If the gain is greater than the pain then somebody needs to clue me up. > > The argument is the same as before: master contains changes that > introduce new features and may break compatibility while maint should > only contain bugfixes. This is important because org also needs to > respect Emacs' release schedule (and synchronize with the bzr repo they > use), which generally means that they will accept bugfixes, but no new > features during certain times (like right now). See my email about the new git workflow: I want to have a branch dedicated to releases. I think it will make things way more readable and manageable. > The other development > model is to develop new stuff in feature branches and those tend not to > get tested too well before going mainline. We already use dedicated branch for development sometimes -- see the branch for Max/Carsten new feature. But you're right in saying that I want to keep the majority of development happening in master. > Ultimately it's Bastiens' call. If he decides to go back to the single > branch model, he'll have to do much more tedious manual work to keep org > in sync with Emacs and when doing bugfix releases. With the old model, the *only* reason for having maint was the Emacs sync issue. Now the reason is to clarify the release process. Best, -- Bastien