Re: branchs and tags and merges oh my!

diff --git a/98/94a298287a318ff450e4df6f83661642038bdb b/98/94a298287a318ff450e4df6f83661642038bdb
new file mode 100644 (file)
index 0000000..57932dd
--- /dev/null
+++ b/98/94a298287a318ff450e4df6f83661642038bdb
@@ -0,0 +1,94 @@
+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 2FA63429E25\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Jul 2011 05:44:34 -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 AfZ3PF-5SZt4 for <notmuch@notmuchmail.org>;\r
+       Sun,  3 Jul 2011 05:44:33 -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 6F0C3431FB6\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Jul 2011 05:44:33 -0700 (PDT)\r
+Received: from zancas.localnet\r
+       (fctnnbsc30w-142167177149.pppoe-dynamic.High-Speed.nb.bellaliant.net\r
+       [142.167.177.149]) (authenticated bits=0)\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p63CiUbA008399\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
+       Sun, 3 Jul 2011 09:44:30 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.76)\r
+       (envelope-from <bremner@unb.ca>)\r
+       id 1QdM2H-00016r-PY; Sun, 03 Jul 2011 09:44:29 -0300\r
+From: David Bremner <david@tethera.net>\r
+To: servilio <servilio@gmail.com>\r
+Subject: Re: branchs and tags and merges oh my!\r
+In-Reply-To:\r
+ <CAPFwwQiVXwQRZ84L5hg5ONwTg1QdXLUytCCp8gKxnp=jfie6XA@mail.gmail.com>\r
+References: <87y60hn0mg.fsf@zancas.localnet> <yun7h81brkn.fsf@aiko.keithp.com>\r
+       <87tyb5mumf.fsf@zancas.localnet>\r
+       <CAPFwwQhGy6a4Hes2-7r8B2J=eaE_+07p4FGoh5ds=Ws1_+5H5w@mail.gmail.com>\r
+       <874o347fot.fsf@zancas.localnet>\r
+       <CAPFwwQiVXwQRZ84L5hg5ONwTg1QdXLUytCCp8gKxnp=jfie6XA@mail.gmail.com>\r
+User-Agent: Notmuch/0.6 (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sun, 03 Jul 2011 09:44:28 -0300\r
+Message-ID: <87iprj5yab.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+       micalg=pgp-sha1; protocol="application/pgp-signature"\r
+Cc: notmuch@notmuchmail.org\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: Sun, 03 Jul 2011 12:44:34 -0000\r
+\r
+--=-=-=\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Sun, 3 Jul 2011 03:14:03 -0400, servilio <servilio@gmail.com> wrote:\r
+>=20\r
+> I think there is no need for tags on master, "make dist" should only\r
+> be run on the "release" branch, right?\r
+>=20\r
+\r
+It isn't just about make dist (which I anyway thinks makes sense to run\r
+on master to make snapshots). Every compilation from git gets a version\r
+number from running git-describe.  So unless we want all developers to\r
+have useless/annoying version numbers, we have to care about tags on\r
+master.\r
+\r
+d\r
+\r
+\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1.4.11 (GNU/Linux)\r
+\r
+iJwEAQECAAYFAk4QZC0ACgkQTiiN/0Um85k6JgQAnpcyvR8t1nl+rgbXoU0lKMcu\r
+H2BwHnqCDFCrbHtNmoUDAdytwVK9TiEGU4pjgZwjVqoa/kZf8FRKgXdWEA+ig2cH\r
+2PwW7PBAFG3neZCBV2z3260IyOI9Urf/RJXvz+TP/N/NxUvdKxLGOmKm5wuRTazz\r
+ttC/sCRQZCz6qp9bo8M=\r
+=gE8c\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r