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 56F2F429E28 for ; Fri, 13 Jan 2012 17:31:18 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -2.3 X-Spam-Level: X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_MED=-2.3] 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 WMkcAzUKpC0X for ; Fri, 13 Jan 2012 17:31:17 -0800 (PST) Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id C0666431FB6 for ; Fri, 13 Jan 2012 17:31:17 -0800 (PST) Received: from zancas.localnet (fctnnbsc36w-156034076032.pppoe-dynamic.High-Speed.nb.bellaliant.net [156.34.76.32]) (authenticated bits=0) by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id q0E1V5p4015570 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Fri, 13 Jan 2012 21:31:06 -0400 Received: from bremner by zancas.localnet with local (Exim 4.77) (envelope-from ) id 1RlsSX-0008HT-GM; Fri, 13 Jan 2012 21:31:05 -0400 From: David Bremner To: Jameson Graef Rollins , Pieter Praet , notmuch@notmuchmail.org Subject: Re: revised patch for gmime init, with test. In-Reply-To: <87ty3ziau7.fsf@servo.finestructure.net> 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> <874nw0nfa8.fsf@zancas.localnet> <87ty3ziau7.fsf@servo.finestructure.net> User-Agent: Notmuch/0.11 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Fri, 13 Jan 2012 21:31:05 -0400 Message-ID: <87pqenjciu.fsf@zancas.localnet> 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 01:31:18 -0000 On Fri, 13 Jan 2012 12:52:48 -0800, Jameson Graef Rollins wrote: > > Doesn't everything need to be merged into master eventually anyway? It > seems to me that unless it's a change that very narrowly targeting an > issue in a release branch that is not an issue in master, every patch > will ultimately need to be applied to both. It doesn't really make > sense to me to apply a change to one branch and not the other, if they > will eventually need to be applied to both anyway. The following two sequences of commands apply the same changes, but result in a different history graph. 1) notmuch checkout release && git am patch && \ notmuch checkout master && git cherry-pick release 2) notmuch checkout release && git am patch && \ notmuch checkout master && git merge release well, they apply the same changes if release was an ancestor of master when the they both began.