From: Keith Packard <keithp@keithp.com>
To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
Subject: Re: branchs and tags and merges oh my!
Date: Fri, 01 Jul 2011 14:48:24 -0700 [thread overview]
Message-ID: <yun7h81brkn.fsf@aiko.keithp.com> (raw)
In-Reply-To: <87y60hn0mg.fsf@zancas.localnet>
[-- Attachment #1: Type: text/plain, Size: 1103 bytes --]
On Fri, 01 Jul 2011 18:37:27 -0300, David Bremner <david@tethera.net> wrote:
> 1) repeat the whole thing with a new release branch for 0.7 and end up
> with
>
> ----------.--------------.------- master
> \ \
> ----- 0.6 --- 0.7
That's the 'usual' plan followed by projects which use a central repository.
> 2) merge master onto the release branch
>
>
> -----------.--------. ----- master
> \ \ /
> ---------.--------.---- 0.7
> 0.6 now freeze
This makes doing 'bug fix' stuff on top of 0.6 a bit more challenging.
As an alternative, you probably should have simply put non-release
patches on a separate 'feature branch' (probably residing in the feature
author's repository) which would then be merged onto master post-0.6, in
the 'merge window' plan. That's the usual plan followed by projects
using multiple repositories and time-based releases. With this model,
you simply release from master when the time comes.
--
keith.packard@intel.com
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2011-07-01 21:48 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 [this message]
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
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=yun7h81brkn.fsf@aiko.keithp.com \
--to=keithp@keithp.com \
--cc=david@tethera.net \
--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).