Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id D4B1541ED9B for ; Fri, 1 Jul 2011 14:48:28 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0.01 X-Spam-Level: X-Spam-Status: No, score=0.01 tagged_above=-999 required=5 tests=[T_MIME_NO_TEXT=0.01] 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 PtoEOwDG516Z for ; Fri, 1 Jul 2011 14:48:28 -0700 (PDT) Received: from keithp.com (home.keithp.com [63.227.221.253]) by olra.theworths.org (Postfix) with ESMTP id D503341ED98 for ; Fri, 1 Jul 2011 14:48:27 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id 4E2E776021B; Fri, 1 Jul 2011 14:48:27 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at keithp.com Received: from keithp.com ([127.0.0.1]) by localhost (keithp.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id QhC8MT8nY9Vk; Fri, 1 Jul 2011 14:48:24 -0700 (PDT) Received: by keithp.com (Postfix, from userid 1033) id E28CC76022B; Fri, 1 Jul 2011 14:48:24 -0700 (PDT) Received: from koto.keithp.com (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id E0D2C76021B; Fri, 1 Jul 2011 14:48:24 -0700 (PDT) Received: by koto.keithp.com (Postfix, from userid 1488) id 840F86425E2; Fri, 1 Jul 2011 14:48:24 -0700 (PDT) From: Keith Packard To: David Bremner , notmuch@notmuchmail.org Subject: Re: branchs and tags and merges oh my! In-Reply-To: <87y60hn0mg.fsf@zancas.localnet> References: <87y60hn0mg.fsf@zancas.localnet> User-Agent: Notmuch/0.5-202-g6ae4e7d (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu) Date: Fri, 01 Jul 2011 14:48:24 -0700 Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" 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: Fri, 01 Jul 2011 21:48:29 -0000 --=-=-= Content-Transfer-Encoding: quoted-printable On Fri, 01 Jul 2011 18:37:27 -0300, David Bremner wrote: > 1) repeat the whole thing with a new release branch for 0.7 and end up > with >=20 > ----------.--------------.------- master > \ \=20=20=20 > ----- 0.6 --- 0.7 That's the 'usual' plan followed by projects which use a central repository. > 2) merge master onto the release branch >=20 >=20 > -----------.--------. ----- master > \ \ / > ---------.--------.---- 0.7 > 0.6 now freeze This makes doing 'bug fix' stuff on top of 0.6 a bit more challenging. As an alternative, you probably should have simply put non-release patches on a separate 'feature branch' (probably residing in the feature author's repository) which would then be merged onto master post-0.6, in the 'merge window' plan. That's the usual plan followed by projects using multiple repositories and time-based releases. With this model, you simply release from master when the time comes. =2D-=20 keith.packard@intel.com --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iD8DBQFODkCoQp8BWwlsTdMRAhygAJ90pwNLOuUTrZ3/PUwGS7ctktnLdACgnUk8 n0MwSciUG2xwxoVx/rc6TuA= =WIAf -----END PGP SIGNATURE----- --=-=-=--