From mboxrd@z Thu Jan  1 00:00:00 1970
From: "H. Peter Anvin" <hpa@zytor.com>
Subject: Re: [PATCH] git-cvsimport-script: handling of tags
Date: Tue, 06 Sep 2005 14:33:25 -0700
Message-ID: <431E0B25.5000104@zytor.com>
References: <431DD381.4050709@zytor.com> <431DE640.8050901@zytor.com>	 <431DFB04.5020701@zytor.com> <46a038f905090614216eca87eb@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Git Mailing List <git@vger.kernel.org>,
	Junio C Hamano <junkio@cox.net>
X-From: git-owner@vger.kernel.org Tue Sep 06 23:35:06 2005
Return-path: <git-owner@vger.kernel.org>
Received: from vger.kernel.org ([209.132.176.167])
	by ciao.gmane.org with esmtp (Exim 4.43)
	id 1ECl4n-0008Go-7Z
	for gcvg-git@gmane.org; Tue, 06 Sep 2005 23:33:57 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1750811AbVIFVdq (ORCPT <rfc822;gcvg-git@m.gmane.org>);
	Tue, 6 Sep 2005 17:33:46 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750820AbVIFVdp
	(ORCPT <rfc822;git-outgoing>); Tue, 6 Sep 2005 17:33:45 -0400
Received: from terminus.zytor.com ([209.128.68.124]:27599 "EHLO
	terminus.zytor.com") by vger.kernel.org with ESMTP id S1750811AbVIFVdp
	(ORCPT <rfc822;git@vger.kernel.org>); Tue, 6 Sep 2005 17:33:45 -0400
Received: from [10.4.1.13] (yardgnome.orionmulti.com [209.128.68.65])
	(authenticated bits=0)
	by terminus.zytor.com (8.13.1/8.13.1) with ESMTP id j86LXU9N020206
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Tue, 6 Sep 2005 14:33:31 -0700
User-Agent: Mozilla Thunderbird 1.0.6-1.1.fc4 (X11/20050720)
X-Accept-Language: en-us, en
To: martin.langhoff@gmail.com
In-Reply-To: <46a038f905090614216eca87eb@mail.gmail.com>
X-Virus-Scanned: ClamAV version 0.86.2, clamav-milter version 0.86 on localhost
X-Virus-Status: Clean
X-Spam-Status: No, score=-5.8 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 
	autolearn=ham version=3.0.4
X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on terminus.zytor.com
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/8149>

Martin Langhoff wrote:
> 
> Tell me more about how you are trying the 'recognize merge'. It is a
> pretty unsophisticated thing, as it trusts the commit message in the
> first place. But when it works, it works.
> 

Perhaps it would be good to know what it expects in the commit message?

My style has always be to use tags for merges; tag the origin branch as 
well as before and after on the receiving branch.

	-hpa