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: Bastien <bzg@altern.org>, emacs-orgmode@gnu.org
Subject: Re: [DEV] New git workflow
Date: Wed, 21 Mar 2012 23:38:55 +0100	[thread overview]
Message-ID: <4F6A587F.9040105@gmx.de> (raw)
In-Reply-To: <87ehsmwcod.fsf@Rainer.invalid>

Hi Achim and Bastien,

in case you fancy with the release-branch model now or in the 
foreseeable future, I'll probably be able to take over some of the work 
load in case it's a deciding factor. I've done that locally when 
necessary, and can claim enough git-foo.

Cheers,

Simon

On 03/21/2012 10:01 AM, Achim Gratz wrote:
> Simon Thum<simon.thum@gmx.de>  writes:
>> 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.
>
> Yes.  Bastien has to make that decision since he's the one doing the
> maintenance.
>
>> 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.
>
> It was intended as a solution to the problem of either not getting
> bugfixes for the latest release or having to live on bleeding edge.  It
> was too shortlived to judge if it had achieved that goal and how
> satisfied people were with it.  Bastien is now trying a three-branch
> model since he also needs to maintain org within Emacs(*).  As long as it
> works for him it will work for us, I'd think.
>
> (*) This should provide similar benefits to users as maint was supposed
> to, albeit it may not be obvious to users on how to follow that branch.
>
>
> Regards,
> Achim.

  reply	other threads:[~2012-03-21 21:41 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
2012-03-21  9:01       ` Achim Gratz
2012-03-21 22:38         ` Simon Thum [this message]
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=4F6A587F.9040105@gmx.de \
    --to=simon.thum@gmx.de \
    --cc=Stromeko@nexgo.de \
    --cc=bzg@altern.org \
    --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).