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 55E8C429E26 for ; Thu, 12 Jan 2012 09:27:20 -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 VIn3fO7UKVbu for ; Thu, 12 Jan 2012 09:27:19 -0800 (PST) Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 278B2429E25 for ; Thu, 12 Jan 2012 09:27:19 -0800 (PST) Received: by wgbds11 with SMTP id ds11so1964852wgb.2 for ; Thu, 12 Jan 2012 09:27:18 -0800 (PST) Received: by 10.180.20.39 with SMTP id k7mr2054077wie.6.1326389237862; Thu, 12 Jan 2012 09:27:17 -0800 (PST) Received: from localhost ([109.131.126.209]) by mx.google.com with ESMTPS id ej7sm6493398wbb.20.2012.01.12.09.27.17 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 12 Jan 2012 09:27:17 -0800 (PST) From: Pieter Praet To: David Bremner , notmuch@notmuchmail.org Subject: Re: revised patch for gmime init, with test. In-Reply-To: <1325388169-8444-1-git-send-email-david@tethera.net> References: <1325306261-21444-2-git-send-email-kaz.rag@gmail.com> <1325388169-8444-1-git-send-email-david@tethera.net> User-Agent: Notmuch/0.10.2+115~gadd29f6 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-unknown-linux-gnu) Date: Thu, 12 Jan 2012 18:25:38 +0100 Message-ID: <871ur4ltnx.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: Thu, 12 Jan 2012 17:27:20 -0000 On Sat, 31 Dec 2011 23:22:46 -0400, David Bremner wrote: > It turns out that our existing (trivial) python test is enough to > catch this bug, but the corpus needs to be augmented. This > augmentation is a bit intrusive so I'm thinking of cherry-picking only > the actual fix to the release branch. > Due to the ~same change being applied in multiple places (and thus 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]. In this specific case (g_mime_init fix), it would have sufficed to apply the test suite augmentation patches on 'master' and the bugfix only on 'maint', merging 'maint' into 'master', and then removing the "test_subtest_known_broken" line in a followup commit on 'master'. Thus, maintainers would have fewer merge conflicts to resolve, developers would at all times benefit from release-specific fixes, and (pre-)release users would have clear indication of what was fixed due to the test suite reporting "FIXED" instead of "PASS". Thanks! > Unfortunately the test message is 8 bit, so it may be encoded in some > inconvenient way for patch application. The message is attached to an > earlier message in the thread if you want to double check. > > I also wondered about putting g_type_init inside the (!initialized) > test, but decided against it on the grounds of minimality. > > I think we want to in the medium term factor out all of the > initialization code into one (probably private) function; we can clean > things up a bit more then. > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch Peace -- Pieter [1] id:"87mxa95u3d.fsf@zancas.localnet"