From owner-freebsd-stable@FreeBSD.ORG  Tue Sep 23 09:25:13 2003
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2B7DB16A4B3
	for <stable@freebsd.org>; Tue, 23 Sep 2003 09:25:13 -0700 (PDT)
Received: from carver.gumbysoft.com (carver.gumbysoft.com [66.220.23.50])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EAFFD43FF9
	for <stable@freebsd.org>; Tue, 23 Sep 2003 09:25:10 -0700 (PDT)
	(envelope-from dwhite@gumbysoft.com)
Received: by carver.gumbysoft.com (Postfix, from userid 1000)
	id DA4C972DA8; Tue, 23 Sep 2003 09:25:10 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1])
	by carver.gumbysoft.com (Postfix) with ESMTP
	id D7F7072DA2; Tue, 23 Sep 2003 09:25:10 -0700 (PDT)
Date: Tue, 23 Sep 2003 09:25:10 -0700 (PDT)
From: Doug White <dwhite@gumbysoft.com>
To: "Jim C. Nasby" <jim@nasby.net>
In-Reply-To: <20030923143459.GS37152@nasby.net>
Message-ID: <20030923092434.U86981@carver.gumbysoft.com>
References: <12829.1064235540@thrush.ravenbrook.com> <3F6F0A0C.1060308@rsm.ru>
 <20030923143459.GS37152@nasby.net>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: stable@freebsd.org
cc: Dmitry Agafonov <aga@rsm.ru>
Subject: Re: About mergemaster (Re: upgrading)
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Production branch of FreeBSD source code
	<freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Sep 2003 16:25:13 -0000

On Tue, 23 Sep 2003, Jim C. Nasby wrote:

> I think a far better solution would be to give mergemaster the ability
> to compare files to the version in CVS as reported by the $FreeBSD$ tag.

In 99% of cases, there is no CVS repo to compare against.

-- 
Doug White                    |  FreeBSD: The Power to Serve
dwhite@gumbysoft.com          |  www.FreeBSD.org