Return-Path: <tom.prince@ualberta.net>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id 0FD16431FD0
	for <notmuch@notmuchmail.org>; Sat,  2 Jul 2011 08:24:14 -0700 (PDT)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: 0
X-Spam-Level: 
X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
	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 2fXNmZKDCE31 for <notmuch@notmuchmail.org>;
	Sat,  2 Jul 2011 08:24:13 -0700 (PDT)
Received: from socrates.hocat.ca (socrates.hocat.ca [76.10.188.53])
	by olra.theworths.org (Postfix) with ESMTP id 93603431FB6
	for <notmuch@notmuchmail.org>; Sat,  2 Jul 2011 08:24:13 -0700 (PDT)
Received: from me (ares.hocat.ca [76.10.189.33])
	by socrates.hocat.ca (Postfix) with SMTP id A90A384FE;
	Sat,  2 Jul 2011 09:24:12 -0600 (MDT)
Received: (nullmailer pid 7677 invoked by uid 1000);
	Sat, 02 Jul 2011 15:23:40 -0000
From: Tom Prince <tom.prince@ualberta.net>
To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
Subject: Re: branchs and tags and merges oh my!
In-Reply-To: <87r568yhq5.fsf@zancas.localnet>
References: <87y60hn0mg.fsf@zancas.localnet> <87r568yhq5.fsf@zancas.localnet>
User-Agent: Notmuch/0.5-118-gdcdb843 (http://notmuchmail.org) Emacs/23.3.1
	(i686-pc-linux-gnu)
Date: Sat, 02 Jul 2011 09:23:40 -0600
Message-ID: <87boxc3dvn.fsf@loki.hocat.ca>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Jul 2011 15:24:14 -0000

On Sat, 02 Jul 2011 09:44:50 -0300, David Bremner <david@tethera.net> wrote:
> 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.

Another solution to this is to tag master just after branching with
something like 0.7-pre.

  Tom