From owner-freebsd-stable@FreeBSD.ORG  Tue Sep 23 13:57:00 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 30F9916A4B3
	for <stable@freebsd.org>; Tue, 23 Sep 2003 13:57:00 -0700 (PDT)
Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 25A0143FE9
	for <stable@freebsd.org>; Tue, 23 Sep 2003 13:56:59 -0700 (PDT)
	(envelope-from imp@bsdimp.com)
Received: from localhost (warner@rover2.village.org [10.0.0.1])
	by harmony.village.org (8.12.9p1/8.12.3) with ESMTP id h8NKuoGA067639;
	Tue, 23 Sep 2003 14:56:51 -0600 (MDT)
	(envelope-from imp@bsdimp.com)
Date: Tue, 23 Sep 2003 14:56:50 -0600 (MDT)
Message-Id: <20030923.145650.93652894.imp@bsdimp.com>
To: dwhite@gumbysoft.com
From: "M. Warner Losh" <imp@bsdimp.com>
In-Reply-To: <20030923092434.U86981@carver.gumbysoft.com>
References: <3F6F0A0C.1060308@rsm.ru>
	<20030923143459.GS37152@nasby.net>
	<20030923092434.U86981@carver.gumbysoft.com>
X-Mailer: Mew version 2.2 on Emacs 21.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
cc: stable@freebsd.org
cc: aga@rsm.ru
Subject: Re: About mergemaster
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 20:57:00 -0000

In message: <20030923092434.U86981@carver.gumbysoft.com>
            Doug White <dwhite@gumbysoft.com> writes:
: 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.

I just wish there was a mode that would manage the FreeBSD files as a
vendor branch and merge my local changes as a new vendor branch import
happens...

Warner