From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id D62E6429E35 for ; Sat, 14 Jan 2012 00:52:51 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kQIAiXnyK3zv for ; Sat, 14 Jan 2012 00:52:51 -0800 (PST) Received: from mail-we0-f181.google.com (mail-we0-f181.google.com [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id F3C38431FB6 for ; Sat, 14 Jan 2012 00:52:50 -0800 (PST) Received: by werh12 with SMTP id h12so4060wer.26 for ; Sat, 14 Jan 2012 00:52:48 -0800 (PST) Received: by 10.216.135.159 with SMTP id u31mr525692wei.2.1326531168252; Sat, 14 Jan 2012 00:52:48 -0800 (PST) Received: from localhost ([109.131.75.86]) by mx.google.com with ESMTPS id ek1sm6108081wib.10.2012.01.14.00.52.47 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 14 Jan 2012 00:52:47 -0800 (PST) From: Pieter Praet To: David Bremner , notmuch@notmuchmail.org Subject: Re: revised patch for gmime init, with test. In-Reply-To: <877h0wnu1l.fsf@zancas.localnet> References: <1325306261-21444-2-git-send-email-kaz.rag@gmail.com> <1325388169-8444-1-git-send-email-david@tethera.net> <871ur4ltnx.fsf@praet.org> <877h0wnu1l.fsf@zancas.localnet> User-Agent: Notmuch/0.10.2+115~gadd29f6 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-unknown-linux-gnu) Date: Sat, 14 Jan 2012 09:51:01 +0100 Message-ID: <878vlar7ka.fsf@praet.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jan 2012 08:52:52 -0000 On Thu, 12 Jan 2012 23:46:46 -0400, David Bremner wrote: > On Thu, 12 Jan 2012 18:25:38 +0100, Pieter Praet wrote: > > On Sat, 31 Dec 2011 23:22:46 -0400, David Bremner 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. [...] This *can* get rather messy when interlacing the 'master'/'maint' merges with non-rebased changesets pulled from other repos (most often aren't rebased in advance since they've already been published), which is a common occurence in the magit [1] repo. But take Org-mode [2] for example (which is an *extremely* active project), where non-rebased changesets are rare(ish), and where the 'maint' branch is constantly being merged back into 'master', resulting in a very clean ladder-like commit log, eg. : --*----*----*----*----*----*---*----*---*---*--- master \ / / \ *-------*-------*-------------*-----------*--- maint 0.11 bugfix NEWS bugfix 0.12~rc1 > [...] [1] would have also been prevented by making the patch against > the right branch. > True, but if we can obviate the need to check if we're on the right branch altogether, without causing any unwanted side-effects, wouldn't it be counterproductive not to? Peace -- Pieter [1] git://github.com/magit/magit.git [2] git://orgmode.org/org-mode.git