[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [O] Merge branch 'maint'

From: Achim Gratz
Subject: Re: [O] Merge branch 'maint'
Date: Fri, 11 Sep 2015 15:40:38 +0200
User-agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0

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?


Also (not exactly the branch model ORg uses, but explains the issues in more detail):


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.


(on the road :-)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]