emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Achim Gratz <Stromeko@Nexgo.DE>
To: emacs-orgmode@gnu.org
Subject: Re: Merge branch 'maint'
Date: Fri, 11 Sep 2015 15:40:38 +0200	[thread overview]
Message-ID: <msulkm$6td$1@ger.gmane.org> (raw)
In-Reply-To: <87vbbhgo9h.fsf@gmail.com>

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 :-)

  parent reply	other threads:[~2015-09-11 13:41 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-09 14:50 Merge branch 'maint' Oleh Krehel
2015-09-09 17:30 ` Kyle Meyer
2015-09-10 10:48   ` Oleh Krehel
2015-09-10 15:05     ` Robert Klein
2015-09-10 22:26     ` Kyle Meyer
2015-09-11 11:59       ` Oleh Krehel
2015-09-11 12:58         ` Josiah Schwab
2015-09-11 14:32           ` Oleh Krehel
2015-09-11 15:25             ` Stefan Nobis
2015-09-11 16:15               ` Oleh Krehel
2015-09-11 13:40         ` Achim Gratz [this message]
2015-09-11 15:24           ` Oleh Krehel
2015-09-15 12:16             ` Nicolas Richard
2015-09-11 13:08       ` Suvayu Ali

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='msulkm$6td$1@ger.gmane.org' \
    --to=stromeko@nexgo.de \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).