emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Bastien <bzg@altern.org>
To: Achim Gratz <Stromeko@nexgo.de>
Cc: emacs-orgmode@gnu.org
Subject: Re: Should maint branch be deprecated?
Date: Tue, 20 Mar 2012 01:58:26 +0100	[thread overview]
Message-ID: <87haxkf5ql.fsf@gnu.org> (raw)
In-Reply-To: <87pqc8dw2u.fsf@Rainer.invalid> (Achim Gratz's message of "Tue, 20 Mar 2012 00:12:25 +0100")

Hi Achim,

Achim Gratz <Stromeko@nexgo.de> 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

  reply	other threads:[~2012-03-20  0:57 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
2012-03-20  0:58   ` Bastien [this message]
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=87haxkf5ql.fsf@gnu.org \
    --to=bzg@altern.org \
    --cc=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).