From owner-freebsd-stable@FreeBSD.ORG  Tue Sep 23 12:06:02 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 7590116A4C1
	for <stable@freebsd.org>; Tue, 23 Sep 2003 12:06:02 -0700 (PDT)
Received: from flake.decibel.org (flake.decibel.org [66.143.173.58])
	by mx1.FreeBSD.org (Postfix) with SMTP id 5617C43FAF
	for <stable@freebsd.org>; Tue, 23 Sep 2003 12:06:01 -0700 (PDT)
	(envelope-from decibel@decibel.org)
Received: (qmail 82459 invoked by uid 1001); 23 Sep 2003 19:06:00 -0000
Date: Tue, 23 Sep 2003 14:06:00 -0500
From: "Jim C. Nasby" <jim@nasby.net>
To: Jason Andresen <jandrese@mitre.org>
Message-ID: <20030923190600.GC72668@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> <3F7080FD.2050505@mitre.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <3F7080FD.2050505@mitre.org>
User-Agent: Mutt/1.4.1i
X-Operating-System: FreeBSD 4.8-RELEASE-p3 i386
X-Distributed: Join the Effort!  http://www.distributed.net
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 19:06:02 -0000

On Tue, Sep 23, 2003 at 01:21:01PM -0400, Jason Andresen wrote:
> 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.

Ahh, forgot about that. I normally don't drop to single user mode to do
updates.

A local 'repository' should take care of this. I don't think it'd even
need to be a full repository; presumably just keeping a copy of
everything from the previous installworld would suffice.
-- 
Jim C. Nasby, Database Consultant                  jim@nasby.net
Member: Triangle Fraternity, Sports Car Club of America
Give your computer some brain candy! www.distributed.net Team #1828

Windows: "Where do you want to go today?"
Linux: "Where do you want to go tomorrow?"
FreeBSD: "Are you guys coming, or what?"