emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Achim Gratz <Stromeko@nexgo.de>
To: emacs-orgmode@gnu.org
Subject: Re: Should maint branch be deprecated?
Date: Tue, 20 Mar 2012 00:12:25 +0100	[thread overview]
Message-ID: <87pqc8dw2u.fsf@Rainer.invalid> (raw)
In-Reply-To: <m2d3882rqj.fsf@btinternet.com>

Martyn Jago <martyn.jago@btinternet.com> writes:
> As an infrequent committer to org-mode, I wonder if the maint branch is
> more pain than gain. 
>
> I've read through the mails arguing for its conception, and the benefits
> just don't appear to be resultant.

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.

> Add to that - infrequent committer's who commit via the list generally
> know nothing about the maintenance branch (including me), which just
> leads to more confusion.
>
> I follow the commits to master, and the work to core developers due to
> the maint branch is clearly not insignificant?

It is actually quite easy:

If it's a bugfix for something broken in a release version, commit to
maint and merge maint back into master.

If implementing a new feature or fixing something not yet released,
commit to master.

> 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).  The other development
model is to develop new stuff in feature branches and those tend not to
get tested too well before going mainline.

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.


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Wavetables for the Terratec KOMPLEXER:
http://Synth.Stromeko.net/Downloads.html#KomplexerWaves

  parent reply	other threads:[~2012-03-19 23:12 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-19 21:41 Martyn Jago
2012-03-19 22:41 ` Bastien
2012-03-19 23:12 ` Achim Gratz [this message]
2012-03-20  0:58   ` Bastien
2012-03-20  1:01 ` Bastien
2012-03-20  3:47   ` Martyn Jago

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=87pqc8dw2u.fsf@Rainer.invalid \
    --to=stromeko@nexgo.de \
    --cc=emacs-orgmode@gnu.org \
    --subject='Re: Should maint branch be deprecated?' \
    /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

Code repositories for project(s) associated with this 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).