1 Return-Path: <pieter@praet.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id D62E6429E35
\r
6 for <notmuch@notmuchmail.org>; Sat, 14 Jan 2012 00:52:51 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id kQIAiXnyK3zv for <notmuch@notmuchmail.org>;
\r
16 Sat, 14 Jan 2012 00:52:51 -0800 (PST)
\r
17 Received: from mail-we0-f181.google.com (mail-we0-f181.google.com
\r
18 [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id F3C38431FB6
\r
21 for <notmuch@notmuchmail.org>; Sat, 14 Jan 2012 00:52:50 -0800 (PST)
\r
22 Received: by werh12 with SMTP id h12so4060wer.26
\r
23 for <notmuch@notmuchmail.org>; Sat, 14 Jan 2012 00:52:48 -0800 (PST)
\r
24 Received: by 10.216.135.159 with SMTP id u31mr525692wei.2.1326531168252;
\r
25 Sat, 14 Jan 2012 00:52:48 -0800 (PST)
\r
26 Received: from localhost ([109.131.75.86])
\r
27 by mx.google.com with ESMTPS id ek1sm6108081wib.10.2012.01.14.00.52.47
\r
28 (version=TLSv1/SSLv3 cipher=OTHER);
\r
29 Sat, 14 Jan 2012 00:52:47 -0800 (PST)
\r
30 From: Pieter Praet <pieter@praet.org>
\r
31 To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
\r
32 Subject: Re: revised patch for gmime init, with test.
\r
33 In-Reply-To: <877h0wnu1l.fsf@zancas.localnet>
\r
34 References: <1325306261-21444-2-git-send-email-kaz.rag@gmail.com>
\r
35 <1325388169-8444-1-git-send-email-david@tethera.net>
\r
36 <871ur4ltnx.fsf@praet.org> <877h0wnu1l.fsf@zancas.localnet>
\r
37 User-Agent: Notmuch/0.10.2+115~gadd29f6 (http://notmuchmail.org) Emacs/23.3.1
\r
38 (x86_64-unknown-linux-gnu)
\r
39 Date: Sat, 14 Jan 2012 09:51:01 +0100
\r
40 Message-ID: <878vlar7ka.fsf@praet.org>
\r
42 Content-Type: text/plain; charset=us-ascii
\r
43 X-BeenThere: notmuch@notmuchmail.org
\r
44 X-Mailman-Version: 2.1.13
\r
46 List-Id: "Use and development of the notmuch mail system."
\r
47 <notmuch.notmuchmail.org>
\r
48 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
49 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
50 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
51 List-Post: <mailto:notmuch@notmuchmail.org>
\r
52 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
53 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
55 X-List-Received-Date: Sat, 14 Jan 2012 08:52:52 -0000
\r
57 On Thu, 12 Jan 2012 23:46:46 -0400, David Bremner <david@tethera.net> wrote:
\r
58 > On Thu, 12 Jan 2012 18:25:38 +0100, Pieter Praet <pieter@praet.org> wrote:
\r
59 > > On Sat, 31 Dec 2011 23:22:46 -0400, David Bremner <david@tethera.net> wrote:
\r
61 > > with differing hashes), this has the potential of causing confusion
\r
62 > > and/or quite some extra work when debugging using git-bisect(1), so
\r
63 > > I'd like to propose that bugfixes for (to-be-)released code are only
\r
64 > > applied on the 'maint' branch ('release' in the case of Notmuch),
\r
65 > > and then immediately merged back into 'master'. In fact, this would
\r
66 > > preferrably happen after *every* (series of) commit(s) on the 'maint'
\r
67 > > branch, to prevent issues like [1].
\r
69 > There is some merit it to this. On the other hand, it makes the history
\r
72 This *can* get rather messy when interlacing the 'master'/'maint' merges
\r
73 with non-rebased changesets pulled from other repos (most often aren't
\r
74 rebased in advance since they've already been published), which is a
\r
75 common occurence in the magit [1] repo.
\r
77 But take Org-mode [2] for example (which is an *extremely* active project),
\r
78 where non-rebased changesets are rare(ish), and where the 'maint' branch
\r
79 is constantly being merged back into 'master', resulting in a very clean
\r
80 ladder-like commit log, eg. :
\r
82 --*----*----*----*----*----*---*----*---*---*--- master
\r
84 *-------*-------*-------------*-----------*--- maint
\r
85 0.11 bugfix NEWS bugfix 0.12~rc1
\r
88 > [...] [1] would have also been prevented by making the patch against
\r
92 True, but if we can obviate the need to check if we're on the right
\r
93 branch altogether, without causing any unwanted side-effects, wouldn't
\r
94 it be counterproductive not to?
\r
102 [1] git://github.com/magit/magit.git
\r
103 [2] git://orgmode.org/org-mode.git
\r