Re: branchs and tags and merges oh my!

diff --git a/56/2397b12da3197ea4c070e188ac2111b3d3cc48 b/56/2397b12da3197ea4c070e188ac2111b3d3cc48
new file mode 100644 (file)
index 0000000..0723e28
--- /dev/null
+++ b/56/2397b12da3197ea4c070e188ac2111b3d3cc48
@@ -0,0 +1,101 @@
+Return-Path: <bremner@unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 78C5F429E21\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Jul 2011 05:45:01 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.29\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.29 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3, T_MIME_NO_TEXT=0.01] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id vnjx+xXRGGpF for <notmuch@notmuchmail.org>;\r
+       Sat,  2 Jul 2011 05:45:00 -0700 (PDT)\r
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id A2B65431FD0\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Jul 2011 05:45:00 -0700 (PDT)\r
+Received: from zancas.localnet\r
+       (fctnnbsc30w-142167176081.pppoe-dynamic.High-Speed.nb.bellaliant.net\r
+       [142.167.176.81]) (authenticated bits=0)\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p62Ciwiw029558\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
+       Sat, 2 Jul 2011 09:44:59 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.76)\r
+       (envelope-from <bremner@unb.ca>)\r
+       id 1QczZC-0007QH-Dn; Sat, 02 Jul 2011 09:44:58 -0300\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: Re: branchs and tags and merges oh my!\r
+In-Reply-To: <87y60hn0mg.fsf@zancas.localnet>\r
+References: <87y60hn0mg.fsf@zancas.localnet>\r
+User-Agent: Notmuch/0.6 (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sat, 02 Jul 2011 09:44:50 -0300\r
+Message-ID: <87r568yhq5.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+       micalg=pgp-sha1; protocol="application/pgp-signature"\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 02 Jul 2011 12:45:01 -0000\r
+\r
+--=-=-=\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Fri, 01 Jul 2011 18:37:27 -0300, David Bremner <david@tethera.net> wrote:\r
+>=20\r
+> So now we have to decide what to do. FWIW, there are about 20 commits on\r
+> release past d6f05fd.\r
+>=20\r
+> There are two obvious strategies going forward.\r
+>=20\r
+\r
+A third strategy is "git checkout master && git merge -s ours 0.6".=20\r
+Then history will look like this:\r
+\r
+  freeze=20=20=20=20=20=20=20\r
+=2D-.-------------.----- master\r
+   \           /\r
+    -----------\r
+               release\r
+\r
+As long as every patch on the release branch is already on master, -s\r
+ours (which throws away all the changes from the side branch) is\r
+reasonable.\r
+\r
+This has the advantage that "git describe master" starts to count from\r
+0.6 instead of 0.5. Currently e.g. "make dist" on master is making\r
+notmuch-0.5-317-gd15faa1.tar.gz. Unless we are going for the\r
+"increasingly innacurately named" effect, that is probably not what we\r
+want.\r
+\r
+d\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1.4.11 (GNU/Linux)\r
+\r
+iJwEAQECAAYFAk4PEsIACgkQTiiN/0Um85nlmAQAhEj4VRZ4vAPU18QO9Pf+/Qxa\r
+Ox2JM//raYBp1U5EDbEOST3obON1ln5DD+/2ZEEqkcpwLs5cW+gGriAstfpqHriX\r
+XlWtzoZ/tETVCBaTk8o/+6zNx9E5inIdKVfQMEz8oMi1zs0S9vln3Y7vOJKd6sVE\r
+eswFZUbpoUKYJtHwpUc=\r
+=mecS\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r