Re: branchs and tags and merges oh my!

diff --git a/b2/652c18c82e1246d3556d50b89efd242f5943f8 b/b2/652c18c82e1246d3556d50b89efd242f5943f8
new file mode 100644 (file)
index 0000000..9be9d24
--- /dev/null
+++ b/b2/652c18c82e1246d3556d50b89efd242f5943f8
@@ -0,0 +1,60 @@
+Return-Path: <tom.prince@ualberta.net>\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 0FD16431FD0\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Jul 2011 08:24:14 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 2fXNmZKDCE31 for <notmuch@notmuchmail.org>;\r
+       Sat,  2 Jul 2011 08:24:13 -0700 (PDT)\r
+Received: from socrates.hocat.ca (socrates.hocat.ca [76.10.188.53])\r
+       by olra.theworths.org (Postfix) with ESMTP id 93603431FB6\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Jul 2011 08:24:13 -0700 (PDT)\r
+Received: from me (ares.hocat.ca [76.10.189.33])\r
+       by socrates.hocat.ca (Postfix) with SMTP id A90A384FE;\r
+       Sat,  2 Jul 2011 09:24:12 -0600 (MDT)\r
+Received: (nullmailer pid 7677 invoked by uid 1000);\r
+       Sat, 02 Jul 2011 15:23:40 -0000\r
+From: Tom Prince <tom.prince@ualberta.net>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: branchs and tags and merges oh my!\r
+In-Reply-To: <87r568yhq5.fsf@zancas.localnet>\r
+References: <87y60hn0mg.fsf@zancas.localnet> <87r568yhq5.fsf@zancas.localnet>\r
+User-Agent: Notmuch/0.5-118-gdcdb843 (http://notmuchmail.org) Emacs/23.3.1\r
+       (i686-pc-linux-gnu)\r
+Date: Sat, 02 Jul 2011 09:23:40 -0600\r
+Message-ID: <87boxc3dvn.fsf@loki.hocat.ca>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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 15:24:14 -0000\r
+\r
+On Sat, 02 Jul 2011 09:44:50 -0300, David Bremner <david@tethera.net> wrote:\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
+Another solution to this is to tag master just after branching with\r
+something like 0.7-pre.\r
+\r
+  Tom\r