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 72145431FD0 for ; Sun, 3 Jul 2011 05:32:59 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -2.29 X-Spam-Level: X-Spam-Status: No, score=-2.29 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_MED=-2.3, 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 2-m+4ZGfJTSv for ; Sun, 3 Jul 2011 05:32:59 -0700 (PDT) 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 DA7F8431FB6 for ; Sun, 3 Jul 2011 05:32:58 -0700 (PDT) Received: from zancas.localnet (fctnnbsc30w-142167177149.pppoe-dynamic.High-Speed.nb.bellaliant.net [142.167.177.149]) (authenticated bits=0) by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p63CWt0U007433 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Sun, 3 Jul 2011 09:32:56 -0300 Received: from bremner by zancas.localnet with local (Exim 4.76) (envelope-from ) id 1QdLqq-00015u-U5; Sun, 03 Jul 2011 09:32:40 -0300 From: David Bremner To: Jed Brown Subject: Re: branchs and tags and merges oh my! In-Reply-To: References: <87y60hn0mg.fsf@zancas.localnet> <87r568yhq5.fsf@zancas.localnet> User-Agent: Notmuch/0.6 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Sun, 03 Jul 2011 09:32:27 -0300 Message-ID: <87mxgv5yuc.fsf@zancas.localnet> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Cc: notmuch@notmuchmail.org 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: Sun, 03 Jul 2011 12:32:59 -0000 --=-=-= Content-Transfer-Encoding: quoted-printable On Sat, 2 Jul 2011 15:23:02 -0500, Jed Brown wrote: > Remind me of why bugfix patches can't (usually) be applied to the > release branch first, then merged into master? Yes, that might work out for a "release" consisting of one or two critical patches, and happening more or less instantly. But maybe it makes sense to make more of an effort to do (some of) the release specific commits first on release and then merging to master, rather than cherry-picking everything during a freeze. In that case we obviously need to merge release back to master. If we want to have one long running release branch, this leads to cross merging between the two branches.=20=20 =2D----.--------------m------m-------.-- master | ^ ^ / \ / /______v=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 \ / /v .--------+------+m-------+ 0.6 0.6.1 0.7 This is all a bit hypothetical at this point of course, since there has never been a bug-fix release. d --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iJwEAQECAAYFAk4QYVwACgkQTiiN/0Um85ng5QQAqjekVmO8oTpoAeTdoFlEXnrR oDcF3KYwhddxD0aiAbzTwPN9PRCN2ojUL0fKzKAXMsTkFhAejBDEOKSkeHdoF0fC tf/C7xm2Xfbcu8OTV0bAH79VaLZgQBqGRQGZh/RfyWCRp5llOc1R/Q58tZ2nrXoS OdS17p+qaiKXrbKL2Co= =0U2y -----END PGP SIGNATURE----- --=-=-=--