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 78C5F429E21 for ; Sat, 2 Jul 2011 05:45:01 -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 vnjx+xXRGGpF for ; Sat, 2 Jul 2011 05:45:00 -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 A2B65431FD0 for ; Sat, 2 Jul 2011 05:45:00 -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 p62Ciwiw029558 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Sat, 2 Jul 2011 09:44:59 -0300 Received: from bremner by zancas.localnet with local (Exim 4.76) (envelope-from ) id 1QczZC-0007QH-Dn; Sat, 02 Jul 2011 09:44:58 -0300 From: David Bremner To: 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.6 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Sat, 02 Jul 2011 09:44:50 -0300 Message-ID: <87r568yhq5.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: Sat, 02 Jul 2011 12:45:01 -0000 --=-=-= Content-Transfer-Encoding: quoted-printable On Fri, 01 Jul 2011 18:37:27 -0300, David Bremner wrote: >=20 > So now we have to decide what to do. FWIW, there are about 20 commits on > release past d6f05fd. >=20 > There are two obvious strategies going forward. >=20 A third strategy is "git checkout master && git merge -s ours 0.6".=20 Then history will look like this: freeze=20=20=20=20=20=20=20 =2D-.-------------.----- master \ / ----------- release As long as every patch on the release branch is already on master, -s ours (which throws away all the changes from the side branch) is reasonable. This has the advantage that "git describe master" starts to count from 0.6 instead of 0.5. Currently e.g. "make dist" on master is making notmuch-0.5-317-gd15faa1.tar.gz. Unless we are going for the "increasingly innacurately named" effect, that is probably not what we want. d --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iJwEAQECAAYFAk4PEsIACgkQTiiN/0Um85nlmAQAhEj4VRZ4vAPU18QO9Pf+/Qxa Ox2JM//raYBp1U5EDbEOST3obON1ln5DD+/2ZEEqkcpwLs5cW+gGriAstfpqHriX XlWtzoZ/tETVCBaTk8o/+6zNx9E5inIdKVfQMEz8oMi1zs0S9vln3Y7vOJKd6sVE eswFZUbpoUKYJtHwpUc= =mecS -----END PGP SIGNATURE----- --=-=-=--