From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 5D73541ED9B for ; Fri, 1 Jul 2011 14:37:42 -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 9yB5dFwuvfE9 for ; Fri, 1 Jul 2011 14:37:41 -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 891A141ED98 for ; Fri, 1 Jul 2011 14:37:41 -0700 (PDT) Received: from zancas.localnet (fctnnbsc30w-142167176081.pppoe-dynamic.High-Speed.nb.bellaliant.net [142.167.176.81]) (authenticated bits=0) by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p61Lbd4q016023 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Fri, 1 Jul 2011 18:37:40 -0300 Received: from bremner by zancas.localnet with local (Exim 4.76) (envelope-from ) id 1QclP6-0005pb-Kx; Fri, 01 Jul 2011 18:37:36 -0300 From: David Bremner To: notmuch@notmuchmail.org Subject: branchs and tags and merges oh my! User-Agent: Notmuch/0.6 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Fri, 01 Jul 2011 18:37:27 -0300 Message-ID: <87y60hn0mg.fsf@zancas.localnet> 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:37:42 -0000 --=-=-= Content-Transfer-Encoding: quoted-printable Much to everyone's relief, 0.6 is finally released. From=20a git perspective, the release process went like this. 0) I branched release from master on June 22 1) I cherry-picked some subset of post June 22 commits from master to release=20 1a) actually I cheated and cherry-picked the last few commits back from release to master. I don't _think_ this matters. 2) I tagged and uploaded from branch release =2D----.-------------- master \ ----------release 0.6 So now we have to decide what to do. FWIW, there are about 20 commits on release past d6f05fd. There are two obvious strategies going forward. 1) repeat the whole thing with a new release branch for 0.7 and end up with =2D---------.--------------.------- master \ \=20=20=20 ----- 0.6 --- 0.7 2) merge master onto the release branch =2D----------.--------. ----- master \ \ / ---------.--------.---- 0.7 0.6 now freeze I personally think having git log 0.6..0.7 do something sensible is worth a lot, but this option does in some sense make the history of master messier (some commits occur twice with different sha1's). Discussion? d --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iJwEAQECAAYFAk4OPhgACgkQTiiN/0Um85mH0gP/aIo1ExYV/2UX0vLpQkqqTEtx Xm00TVgVSBVbO6ZGBpjIRJak0HFpWCk4+5nf6zJ4kYzqrS7Ppvb4xJqPmpOlPKGB FLZnPUHljGxUBfUfDCvh8E40GvK3zZYZHwcnKnn90Sw7HXjI3gXG1Fqqp6FJUXuR V8lbT4xjK4LkxZTZeGs= =Dawl -----END PGP SIGNATURE----- --=-=-=--