1 Return-Path: <bremner@unb.ca>
\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 56F2F429E28
\r
6 for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 17:31:18 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] 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 WMkcAzUKpC0X for <notmuch@notmuchmail.org>;
\r
16 Fri, 13 Jan 2012 17:31:17 -0800 (PST)
\r
17 Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])
\r
18 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id C0666431FB6
\r
21 for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 17:31:17 -0800 (PST)
\r
22 Received: from zancas.localnet
\r
23 (fctnnbsc36w-156034076032.pppoe-dynamic.High-Speed.nb.bellaliant.net
\r
24 [156.34.76.32]) (authenticated bits=0)
\r
25 by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id q0E1V5p4015570
\r
26 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);
\r
27 Fri, 13 Jan 2012 21:31:06 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.77)
\r
29 (envelope-from <bremner@unb.ca>)
\r
30 id 1RlsSX-0008HT-GM; Fri, 13 Jan 2012 21:31:05 -0400
\r
31 From: David Bremner <david@tethera.net>
\r
32 To: Jameson Graef Rollins <jrollins@finestructure.net>,
\r
33 Pieter Praet <pieter@praet.org>, notmuch@notmuchmail.org
\r
34 Subject: Re: revised patch for gmime init, with test.
\r
35 In-Reply-To: <87ty3ziau7.fsf@servo.finestructure.net>
\r
36 References: <1325306261-21444-2-git-send-email-kaz.rag@gmail.com>
\r
37 <1325388169-8444-1-git-send-email-david@tethera.net>
\r
38 <871ur4ltnx.fsf@praet.org> <877h0wnu1l.fsf@zancas.localnet>
\r
39 <874nw0nfa8.fsf@zancas.localnet>
\r
40 <87ty3ziau7.fsf@servo.finestructure.net>
\r
41 User-Agent: Notmuch/0.11 (http://notmuchmail.org) Emacs/23.3.1
\r
42 (x86_64-pc-linux-gnu)
\r
43 Date: Fri, 13 Jan 2012 21:31:05 -0400
\r
44 Message-ID: <87pqenjciu.fsf@zancas.localnet>
\r
46 Content-Type: text/plain; charset=us-ascii
\r
47 X-BeenThere: notmuch@notmuchmail.org
\r
48 X-Mailman-Version: 2.1.13
\r
50 List-Id: "Use and development of the notmuch mail system."
\r
51 <notmuch.notmuchmail.org>
\r
52 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
54 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
55 List-Post: <mailto:notmuch@notmuchmail.org>
\r
56 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
57 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
58 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
59 X-List-Received-Date: Sat, 14 Jan 2012 01:31:18 -0000
\r
61 On Fri, 13 Jan 2012 12:52:48 -0800, Jameson Graef Rollins <jrollins@finestructure.net> wrote:
\r
63 > Doesn't everything need to be merged into master eventually anyway? It
\r
64 > seems to me that unless it's a change that very narrowly targeting an
\r
65 > issue in a release branch that is not an issue in master, every patch
\r
66 > will ultimately need to be applied to both. It doesn't really make
\r
67 > sense to me to apply a change to one branch and not the other, if they
\r
68 > will eventually need to be applied to both anyway.
\r
70 The following two sequences of commands apply the same changes, but
\r
71 result in a different history graph.
\r
73 1) notmuch checkout release && git am patch && \
\r
74 notmuch checkout master && git cherry-pick release
\r
76 2) notmuch checkout release && git am patch && \
\r
77 notmuch checkout master && git merge release
\r
79 well, they apply the same changes if release was an ancestor of master
\r
80 when the they both began.
\r