From owner-freebsd-stable@FreeBSD.ORG  Tue Sep 23 10:21:17 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 2DAFB16A4B3
	for <stable@freebsd.org>; Tue, 23 Sep 2003 10:21:17 -0700 (PDT)
Received: from smtpproxy1.mitre.org (smtpproxy1.mitre.org [192.160.51.75])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BB1384400F
	for <stable@freebsd.org>; Tue, 23 Sep 2003 10:21:15 -0700 (PDT)
	(envelope-from jandrese@mitre.org)
Received: from avsrv1.mitre.org (avsrv1.mitre.org [129.83.20.58])
	by smtpproxy1.mitre.org (8.12.10/8.12.8) with ESMTP id h8NHLEQs007334;
	Tue, 23 Sep 2003 13:21:14 -0400 (EDT)
Received: from MAILHUB1 (mailhub1.mitre.org [129.83.20.31])
	by smtpsrv1.mitre.org (8.12.9/8.12.8) with ESMTP id h8NHLCLJ002300;
	Tue, 23 Sep 2003 13:21:12 -0400 (EDT)
Received: from mm112324-2k.mitre.org (128.29.3.31) by mailhub1.mitre.org with
	SMTP        id 4293548; Tue, 23 Sep 2003 13:21:06 -0400
Message-ID: <3F7080FD.2050505@mitre.org>
Date: Tue, 23 Sep 2003 13:21:01 -0400
From: Jason Andresen <jandrese@mitre.org>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US;
	rv:1.4) Gecko/20030612
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: "Jim C. Nasby" <jim@nasby.net>
References: <12829.1064235540@thrush.ravenbrook.com> <3F6F0A0C.1060308@rsm.ru>
	<20030923143459.GS37152@nasby.net>
	<20030923092434.U86981@carver.gumbysoft.com>
	<20030923170509.GA72668@nasby.net>
In-Reply-To: <20030923170509.GA72668@nasby.net>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
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 17:21:17 -0000

Jim C. Nasby wrote:

> On Tue, Sep 23, 2003 at 09:25:10AM -0700, Doug White wrote:
> 
>>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.
> 
>  
> Huh? What about the main FBSD CVS repository?

Mergemaster is typically run in single user mode.  Unless you're running 
mergemaster on a CVS mirror, you're not going to be able to get at it.

-- 
   \  |_ _|__ __|_ \ __| Jason Andresen        jandrese@mitre.org
  |\/ |  |    |    / _|  Network and Distributed Systems Engineer
_|  _|___|  _| _|_\___| Office: 703-883-7755