From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: Merge branch 'maint' Date: Fri, 11 Sep 2015 15:40:38 +0200 Message-ID: References: <87twr37il4.fsf@gmail.com> <87y4gfpkjy.fsf@kyleam.com> <87lhceo8he.fsf@gmail.com> <87mvwtvrkc.fsf@kyleam.com> <87vbbhgo9h.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaOZf-0004yW-0s for emacs-orgmode@gnu.org; Fri, 11 Sep 2015 09:41:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaOZa-0007pS-Nr for emacs-orgmode@gnu.org; Fri, 11 Sep 2015 09:41:06 -0400 Received: from plane.gmane.org ([80.91.229.3]:40040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaOZa-0007oY-6g for emacs-orgmode@gnu.org; Fri, 11 Sep 2015 09:41:02 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1ZaOZZ-00009r-0E for emacs-orgmode@gnu.org; Fri, 11 Sep 2015 15:41:01 +0200 Received: from p4fcf7248.dip0.t-ipconnect.de ([79.207.114.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 11 Sep 2015 15:41:00 +0200 Received: from Stromeko by p4fcf7248.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 11 Sep 2015 15:41:00 +0200 In-Reply-To: <87vbbhgo9h.fsf@gmail.com> 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 Am 11.09.2015 um 13:59 schrieb Oleh Krehel: > What is the purpose of maint exactly? It's a bit short on the explanation side, but does that help? http://orgmode.org/worg/dev/index.html Also (not exactly the branch model ORg uses, but explains the issues in more detail): http://nvie.com/posts/a-successful-git-branching-model/ http://www.draconianoverlord.com/2013/09/07/no-cherry-picking.html http://williamdurand.fr/2012/01/17/my-git-branching-model/ > In Emacs git repository there's > master and emacs24. All commits apply to master first, while some are > cherry picked onto emacs24. The emacs24 branch will never be merged into > master: it's divergent and that's fine. You might want to check your facts (most recently, see for instance commit 59db4308b546). Realitity simply doesn't conform to your world-view and the conclusions you draw from it are similarly distorted. Cherry-picking from master to emacs24 is actually fixing a mistake made when committing a bug-fix to master. > As I understood, for Org mode some commits are applied to maint, and > then merged into master. Why? Because that's how you make sure that bugfixes are applied to the releases in maint and get incorporated into master so that they don't vanish with the next release, all while each change appears exactly in one commit. -- Achim. (on the road :-)