emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Simon Thum <simon.thum@gmx.de>
To: Achim Gratz <Stromeko@nexgo.de>
Cc: emacs-orgmode@gnu.org
Subject: Re: [DEV] New git workflow
Date: Wed, 21 Mar 2012 09:46:49 +0100	[thread overview]
Message-ID: <4F699579.2090505@gmx.de> (raw)
In-Reply-To: <874ntilxh9.fsf@Rainer.invalid>

Hi Achim,

On 03/20/2012 11:27 PM, Achim Gratz wrote:
> Sorry, but cherry-picking into multiple release branches would simply
> not be a sane development model for a small project like orgmode.

I just wanted to make sure it's considered.

Whether multiple branches are involved depends mainly on what releases 
one intends to maintain. The nice thing in the model is the gradual 
maintenance: A really critical fix could see more backports than a nicety.

>
>> I guess a decision should mostly be based on how significant the use
>> case "back-port fix" is to org-mode. The "safer master" role of maint
>> could of course be retained in a stable branch which points to
>> something like master@{1 month ago}.
>
> Any point in the past is no safer than today's master.  The stability
> that maint should provide to users is with regards to the feature set,
> i.e. no gratuitous changes between releases.

Ooops, I just wanted to illustrate that "stable" is typically behind 
master - ultimately it should be a concious decision what is "stable".

I like the goal maint is set to achieve, I'm just not convinced regular 
merges are a good way to ensure it - after all, merges include 
everything in a branch. If there are no doubts about that on your side, 
I'm fine.

Cheers,

Simon

  reply	other threads:[~2012-03-21  7:49 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-20  0:51 Bastien
2012-03-20  7:03 ` Achim Gratz
2012-03-20  7:24   ` Achim Gratz
2012-03-20 10:40   ` Bastien
2012-03-20 19:20     ` Achim Gratz
2012-03-21  0:02       ` Bastien
2012-03-21  0:23         ` Bastien
2012-03-20 10:47   ` Bastien
2012-03-20 22:35 ` Simon Thum
2012-03-20 22:27   ` Achim Gratz
2012-03-21  8:46     ` Simon Thum [this message]
2012-03-21  9:01       ` Achim Gratz
2012-03-21 22:38         ` Simon Thum
2012-03-24 11:05   ` Daniel Dehennin
2012-03-24 20:08     ` Simon Thum
2012-03-24 19:29       ` Nick Dokos
2012-04-01  9:26         ` Simon Thum

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=4F699579.2090505@gmx.de \
    --to=simon.thum@gmx.de \
    --cc=Stromeko@nexgo.de \
    --cc=emacs-orgmode@gnu.org \
    --subject='Re: [DEV] New git workflow' \
    /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).