unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: David Bremner <david@tethera.net>
To: servilio <servilio@gmail.com>
Cc: notmuch@notmuchmail.org
Subject: Re: branchs and tags and merges oh my!
Date: Sat, 02 Jul 2011 14:30:58 -0300	[thread overview]
Message-ID: <874o347fot.fsf@zancas.localnet> (raw)
In-Reply-To: <CAPFwwQhGy6a4Hes2-7r8B2J=eaE_+07p4FGoh5ds=Ws1_+5H5w@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]

On Sat, 2 Jul 2011 11:59:04 -0400, servilio <servilio@gmail.com> wrote:
> What about having Carl do the merging of features into a develop
> branch[1], then the release manager prepares a release in a release
> branch, merging back and tagging into master when release is ready? A
> similar workflow could be followed for bugfix releases (branch to
> bugfix/release branch, prepare, merge back to master, tag).

We could also call the develop branch "master" and use something like
"release" for the branch that contains the release history.  This is
is technically quite close to option #2, but perhaps conceptually 
clearer (and throwing in Tom's tagging idea).

       0.7-pre          0.8-pre        0.9-pre
-----.+--------------.+-------------.+------------- master
      \             /              /
       --------.    |             /  
                \  /     0.7     /   
                 +m------+-----+m--------+ release
              0.6          0.7.1       0.8

One difference in this version is that a merge from master onto release
(and convenience tagging of master) occurs only when we are ready to
release.  If a bug fix release is desired, it can be done by
committing/cherry-picking on release.

d

[-- Attachment #2: Type: application/pgp-signature, Size: 315 bytes --]

  reply	other threads:[~2011-07-02 17:31 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-01 21:37 branchs and tags and merges oh my! David Bremner
2011-07-01 21:48 ` Keith Packard
2011-07-01 23:47   ` David Bremner
2011-07-02 15:59     ` servilio
2011-07-02 17:30       ` David Bremner [this message]
2011-07-03  7:14         ` servilio
2011-07-03 12:44           ` David Bremner
2011-07-03 14:41             ` servilio
2011-07-02 12:44 ` David Bremner
2011-07-02 15:23   ` Tom Prince
2011-07-02 20:23   ` Jed Brown
2011-07-03 12:32     ` David Bremner
2011-07-03 14:30       ` servilio

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://notmuchmail.org/

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

  git send-email \
    --in-reply-to=874o347fot.fsf@zancas.localnet \
    --to=david@tethera.net \
    --cc=notmuch@notmuchmail.org \
    --cc=servilio@gmail.com \
    /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://yhetil.org/notmuch.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).