From owner-freebsd-current  Tue Oct  8 15:40:44 2002
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 7590337B401; Tue,  8 Oct 2002 15:40:43 -0700 (PDT)
Received: from dragon.nuxi.com (trang.nuxi.com [66.92.13.169])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id F224943E6A; Tue,  8 Oct 2002 15:40:42 -0700 (PDT)
	(envelope-from obrien@NUXI.com)
Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1])
	by dragon.nuxi.com (8.12.6/8.12.2) with ESMTP id g98Meg5b013962;
	Tue, 8 Oct 2002 15:40:42 -0700 (PDT)
	(envelope-from obrien@dragon.nuxi.com)
Received: (from obrien@localhost)
	by dragon.nuxi.com (8.12.6/8.12.5/Submit) id g98MegxF013961;
	Tue, 8 Oct 2002 15:40:42 -0700 (PDT)
Date: Tue, 8 Oct 2002 15:40:42 -0700
From: "David O'Brien" <obrien@FreeBSD.org>
To: John Baldwin <jhb@FreeBSD.org>
Cc: Alexander Kabaev <ak03@gte.com>, current@FreeBSD.org,
	Dag-Erling Smorgrav <des@FreeBSD.org>
Subject: Re: i386 tinderbox failure
Message-ID: <20021008224042.GA13880@dragon.nuxi.com>
Reply-To: obrien@FreeBSD.org
Mail-Followup-To: David O'Brien <obrien@FreeBSD.org>,
	John Baldwin <jhb@FreeBSD.org>, Alexander Kabaev <ak03@gte.com>,
	current@FreeBSD.ORG, Dag-Erling Smorgrav <des@FreeBSD.ORG>
References: <20021008142335.13e7a72d.ak03@gte.com> <XFMail.20021008155536.jhb@FreeBSD.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <XFMail.20021008155536.jhb@FreeBSD.org>
User-Agent: Mutt/1.4i
X-Operating-System: FreeBSD 5.0-CURRENT
Organization: The NUXI BSD Group
X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3  90 76 5D 69 58 D9 98 7A
X-Pgp-Rsa-Keyid: 1024/34F9F9D5
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-current.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-current>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-current>
X-Loop: FreeBSD.ORG

On Tue, Oct 08, 2002 at 03:55:36PM -0400, John Baldwin wrote:
> Could you please just commit this on the vendor branch if it is the
> vendor fix for now.  Since the next vendor import will contain the
> fix you don't need to worry about maintaining the local patch so
> committing it onto the vendor branch is ok.

Doing this screws up diffs to vendor source as there won't be a tag that
corisponds with this across all files.  For small contribed things that
is OK.  But when doing large ones it the following import+merge becomes
harder.

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message