From: David Bremner <david@tethera.net>
To: Pieter Praet <pieter@praet.org>, notmuch@notmuchmail.org
Subject: Re: revised patch for gmime init, with test.
Date: Fri, 13 Jan 2012 05:05:35 -0400 [thread overview]
Message-ID: <874nw0nfa8.fsf@zancas.localnet> (raw)
In-Reply-To: <877h0wnu1l.fsf@zancas.localnet>
On Thu, 12 Jan 2012 23:46:46 -0400, David Bremner <david@tethera.net> wrote:
> On Thu, 12 Jan 2012 18:25:38 +0100, Pieter Praet <pieter@praet.org> wrote:
> > On Sat, 31 Dec 2011 23:22:46 -0400, David Bremner <david@tethera.net> wrote:
>
> > with differing hashes), this has the potential of causing confusion
> > and/or quite some extra work when debugging using git-bisect(1), so
> > I'd like to propose that bugfixes for (to-be-)released code are only
> > applied on the 'maint' branch ('release' in the case of Notmuch),
> > and then immediately merged back into 'master'. In fact, this would
> > preferrably happen after *every* (series of) commit(s) on the 'maint'
> > branch, to prevent issues like [1].
>
> There is some merit it to this. On the other hand, it makes the history
> messier. [1] would have also been prevented by making the patch against
> the right branch.
I thought about this a bit more, and I agree that at least the release
candidates (basically anything tagged on branch release) ought to be
merged back to master. Since any series of bugfix patches seems to be
cause for a new release candidate, this should avoid the need to have
doubly applied patches.
I'm less convinced about the need to merge every little doc change and
debian packaging change back to master right away. This might be a
purely aesthetic objection; I'm not sure if the extra merge commits
cause any problems for e.g. bisection.
d
next prev parent reply other threads:[~2012-01-13 9:05 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-30 0:57 Segmentation fault at gmime-iconv with python binding Kazuo Teramoto
2011-12-30 14:58 ` David Bremner
2011-12-30 21:58 ` [PATCH 0/2] Multiples calls of g_mime_init Kazuo Teramoto
2011-12-30 21:58 ` [PATCH 1/2] lib: Remove unnecessary checks when calling g_mime_init Kazuo Teramoto
2011-12-31 2:55 ` David Bremner
2011-12-31 3:07 ` Kazuo Teramoto
2011-12-31 4:45 ` Austin Clements
2012-01-21 13:25 ` David Bremner
2012-01-21 13:32 ` Kazuo Teramoto
2011-12-30 21:58 ` [PATCH 2/2] lib: call g_mime_init from notmuch_database_open Kazuo Teramoto
2011-12-31 3:02 ` David Bremner
2011-12-31 4:37 ` [PATCH] lib: call g_mime_init() from notmuch_database_open() Kazuo Teramoto
2011-12-31 4:37 ` Kazuo Teramoto
2012-01-01 3:22 ` revised patch for gmime init, with test David Bremner
2012-01-01 3:22 ` [PATCH v2 1/3] test: use file based comparison for search '*' test David Bremner
2012-01-01 3:22 ` [PATCH v2 2/3] test: add two new messages to corpus with iso-8859-1 encoding David Bremner
2012-01-01 3:22 ` [PATCH v2 3/3] lib: call g_mime_init() from notmuch_database_open() David Bremner
2012-01-12 17:25 ` revised patch for gmime init, with test Pieter Praet
2012-01-13 3:46 ` David Bremner
2012-01-13 9:05 ` David Bremner [this message]
2012-01-13 20:52 ` Jameson Graef Rollins
2012-01-14 1:31 ` David Bremner
2012-01-14 8:54 ` Pieter Praet
2012-01-14 8:51 ` Pieter Praet
2012-01-02 12:56 ` [PATCH 2/2] lib: call g_mime_init from notmuch_database_open Tomi Ollila
2011-12-31 1:16 ` [PATCH 0/2] Multiples calls of g_mime_init Patrick Totzke
2011-12-31 1:30 ` Kazuo Teramoto
2012-01-02 15:43 ` Segmentation fault at gmime-iconv with python binding Sebastian Spaeth
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=874nw0nfa8.fsf@zancas.localnet \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
--cc=pieter@praet.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).