From: David Bremner <david@tethera.net>
To: Jed Brown <jed@59A2.org>
Cc: notmuch@notmuchmail.org
Subject: Re: branchs and tags and merges oh my!
Date: Sun, 03 Jul 2011 09:32:27 -0300 [thread overview]
Message-ID: <87mxgv5yuc.fsf@zancas.localnet> (raw)
In-Reply-To: <BANLkTik4hYYHpe_igt-Vf6t8e+_bVz6p+g@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1083 bytes --]
On Sat, 2 Jul 2011 15:23:02 -0500, Jed Brown <jed@59A2.org> wrote:
> Remind me of why bugfix patches can't (usually) be applied to the
> release branch first, then merged into master?
Yes, that might work out for a "release" consisting of one or two
critical patches, and happening more or less instantly. But maybe it
makes sense to make more of an effort to do (some of) the release
specific commits first on release and then merging to master, rather
than cherry-picking everything during a freeze.
In that case we obviously need to merge release back to master. If we
want to have one long running release branch, this leads to cross
merging between the two branches.
-----.--------------m------m-------.-- master
| ^ ^ /
\ / /______v
\ / /v
.--------+------+m-------+
0.6 0.6.1 0.7
This is all a bit hypothetical at this point of course, since there has
never been a bug-fix release.
d
[-- Attachment #2: Type: application/pgp-signature, Size: 315 bytes --]
next prev parent reply other threads:[~2011-07-03 12:32 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
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 [this message]
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=87mxgv5yuc.fsf@zancas.localnet \
--to=david@tethera.net \
--cc=jed@59A2.org \
--cc=notmuch@notmuchmail.org \
/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).