1 Return-Path: <keithp@keithp.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 D4B1541ED9B
\r
6 for <notmuch@notmuchmail.org>; Fri, 1 Jul 2011 14:48:28 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.01 tagged_above=-999 required=5
\r
12 tests=[T_MIME_NO_TEXT=0.01] 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 PtoEOwDG516Z for <notmuch@notmuchmail.org>;
\r
16 Fri, 1 Jul 2011 14:48:28 -0700 (PDT)
\r
17 Received: from keithp.com (home.keithp.com [63.227.221.253])
\r
18 by olra.theworths.org (Postfix) with ESMTP id D503341ED98
\r
19 for <notmuch@notmuchmail.org>; Fri, 1 Jul 2011 14:48:27 -0700 (PDT)
\r
20 Received: from localhost (localhost [127.0.0.1])
\r
21 by keithp.com (Postfix) with ESMTP id 4E2E776021B;
\r
22 Fri, 1 Jul 2011 14:48:27 -0700 (PDT)
\r
23 X-Virus-Scanned: Debian amavisd-new at keithp.com
\r
24 Received: from keithp.com ([127.0.0.1])
\r
25 by localhost (keithp.com [127.0.0.1]) (amavisd-new, port 10024)
\r
26 with LMTP id QhC8MT8nY9Vk; Fri, 1 Jul 2011 14:48:24 -0700 (PDT)
\r
27 Received: by keithp.com (Postfix, from userid 1033)
\r
28 id E28CC76022B; Fri, 1 Jul 2011 14:48:24 -0700 (PDT)
\r
29 Received: from koto.keithp.com (localhost [127.0.0.1])
\r
30 by keithp.com (Postfix) with ESMTP id E0D2C76021B;
\r
31 Fri, 1 Jul 2011 14:48:24 -0700 (PDT)
\r
32 Received: by koto.keithp.com (Postfix, from userid 1488)
\r
33 id 840F86425E2; Fri, 1 Jul 2011 14:48:24 -0700 (PDT)
\r
34 From: Keith Packard <keithp@keithp.com>
\r
35 To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
\r
36 Subject: Re: branchs and tags and merges oh my!
\r
37 In-Reply-To: <87y60hn0mg.fsf@zancas.localnet>
\r
38 References: <87y60hn0mg.fsf@zancas.localnet>
\r
39 User-Agent: Notmuch/0.5-202-g6ae4e7d (http://notmuchmail.org) Emacs/23.3.1
\r
41 Date: Fri, 01 Jul 2011 14:48:24 -0700
\r
42 Message-ID: <yun7h81brkn.fsf@aiko.keithp.com>
\r
44 Content-Type: multipart/signed; boundary="=-=-=";
\r
45 micalg=pgp-sha1; protocol="application/pgp-signature"
\r
46 X-BeenThere: notmuch@notmuchmail.org
\r
47 X-Mailman-Version: 2.1.13
\r
49 List-Id: "Use and development of the notmuch mail system."
\r
50 <notmuch.notmuchmail.org>
\r
51 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
53 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
54 List-Post: <mailto:notmuch@notmuchmail.org>
\r
55 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
56 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
57 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
58 X-List-Received-Date: Fri, 01 Jul 2011 21:48:29 -0000
\r
61 Content-Transfer-Encoding: quoted-printable
\r
63 On Fri, 01 Jul 2011 18:37:27 -0300, David Bremner <david@tethera.net> wrote:
\r
65 > 1) repeat the whole thing with a new release branch for 0.7 and end up
\r
68 > ----------.--------------.------- master
\r
72 That's the 'usual' plan followed by projects which use a central repository.
\r
74 > 2) merge master onto the release branch
\r
77 > -----------.--------. ----- master
\r
79 > ---------.--------.---- 0.7
\r
82 This makes doing 'bug fix' stuff on top of 0.6 a bit more challenging.
\r
84 As an alternative, you probably should have simply put non-release
\r
85 patches on a separate 'feature branch' (probably residing in the feature
\r
86 author's repository) which would then be merged onto master post-0.6, in
\r
87 the 'merge window' plan. That's the usual plan followed by projects
\r
88 using multiple repositories and time-based releases. With this model,
\r
89 you simply release from master when the time comes.
\r
92 keith.packard@intel.com
\r
95 Content-Type: application/pgp-signature
\r
97 -----BEGIN PGP SIGNATURE-----
\r
98 Version: GnuPG v1.4.11 (GNU/Linux)
\r
100 iD8DBQFODkCoQp8BWwlsTdMRAhygAJ90pwNLOuUTrZ3/PUwGS7ctktnLdACgnUk8
\r
101 n0MwSciUG2xwxoVx/rc6TuA=
\r
103 -----END PGP SIGNATURE-----
\r