1 Return-Path: <servilio@gmail.com>
\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 189C5431FD0
\r
6 for <notmuch@notmuchmail.org>; Sun, 3 Jul 2011 07:30:50 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id zdo2DCWQAHLX for <notmuch@notmuchmail.org>;
\r
17 Sun, 3 Jul 2011 07:30:48 -0700 (PDT)
\r
18 Received: from mail-pz0-f53.google.com (mail-pz0-f53.google.com
\r
19 [209.85.210.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 9B5C6431FB6
\r
22 for <notmuch@notmuchmail.org>; Sun, 3 Jul 2011 07:30:48 -0700 (PDT)
\r
23 Received: by pzk6 with SMTP id 6so2489179pzk.26
\r
24 for <notmuch@notmuchmail.org>; Sun, 03 Jul 2011 07:30:47 -0700 (PDT)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
26 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
\r
27 :cc:content-type:content-transfer-encoding;
\r
28 bh=hVhHYCTcdYeWPYcdE2rziPsqR8woZvr0bF8O5kqvrPM=;
\r
29 b=D3E+zlzxgzl10vx1eXcQ6n0n7ifdTGO1VP12PaiDgt+/9vQPlke7f/utHrBMOPJPTs
\r
30 5d2tSOjdC9BC7stbtPe4qffZHl5ohdzaKo3C24tQfTfUwo07qOzSHBcRnYRBmCHy2Lex
\r
31 q38/moOr+NpbfXglfzbdQ3GJR+VB2fVvbnef0=
\r
33 Received: by 10.68.58.229 with SMTP id u5mr6463221pbq.233.1309703447697; Sun,
\r
34 03 Jul 2011 07:30:47 -0700 (PDT)
\r
35 Received: by 10.68.43.170 with HTTP; Sun, 3 Jul 2011 07:30:47 -0700 (PDT)
\r
36 In-Reply-To: <87mxgv5yuc.fsf@zancas.localnet>
\r
37 References: <87y60hn0mg.fsf@zancas.localnet> <87r568yhq5.fsf@zancas.localnet>
\r
38 <BANLkTik4hYYHpe_igt-Vf6t8e+_bVz6p+g@mail.gmail.com>
\r
39 <87mxgv5yuc.fsf@zancas.localnet>
\r
40 Date: Sun, 3 Jul 2011 10:30:47 -0400
\r
42 <CAPFwwQg7padz4rwE6pokYriKg8hD_jRHdgXRq6wW-_eKxKvzmA@mail.gmail.com>
\r
43 Subject: Re: branchs and tags and merges oh my!
\r
44 From: servilio <servilio@gmail.com>
\r
45 To: David Bremner <david@tethera.net>
\r
46 Content-Type: text/plain; charset=UTF-8
\r
47 Content-Transfer-Encoding: quoted-printable
\r
48 Cc: notmuch@notmuchmail.org
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Sun, 03 Jul 2011 14:30:50 -0000
\r
63 On 3 July 2011 08:32, David Bremner <david@tethera.net> wrote:
\r
64 > On Sat, 2 Jul 2011 15:23:02 -0500, Jed Brown <jed@59A2.org> wrote:
\r
66 >> Remind me of why bugfix patches can't (usually) be applied to the
\r
67 >> release branch first, then merged into master?
\r
69 > Yes, that might work out for a "release" consisting of one or two
\r
70 > critical patches, and happening more or less instantly. =C2=A0But maybe i=
\r
72 > makes sense to make more of an effort to do (some of) the release
\r
73 > specific commits first on release and then merging to master, rather
\r
74 > than cherry-picking everything during a freeze.
\r
76 If by "a freeze" you mean freezing Carl's working branch, I agree,
\r
77 that work is better done in different branch so no restriction is
\r
78 imposed on Carl workflow.
\r
80 > In that case we obviously need to merge release back to master. =C2=A0If =
\r
82 > want to have one long running release branch, this leads to cross
\r
83 > merging between the two branches.
\r
85 > -----.--------------m------m-------.-- master
\r
86 > =C2=A0 =C2=A0 | =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^ =C2=A0 =
\r
87 =C2=A0 =C2=A0^ =C2=A0 =C2=A0 =C2=A0/
\r
88 > =C2=A0 =C2=A0 =C2=A0\ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/ =C2=A0 =
\r
89 =C2=A0 =C2=A0/______v
\r
90 > =C2=A0 =C2=A0 =C2=A0 \ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/ =C2=A0 =C2=A0 =
\r
92 > =C2=A0 =C2=A0 =C2=A0 =C2=A0.--------+------+m-------+
\r
93 > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A00.6 =C2=A0 =C2=A00=
\r
94 .6.1 =C2=A0 =C2=A0 0.7
\r
96 > This is all a bit hypothetical at this point of course, since there has
\r
97 > never been a bug-fix release.
\r
99 But there shouldn't be any issue, any changes done in "release" should
\r
100 be merged back to master as I see it.
\r