From owner-cvs-src@FreeBSD.ORG  Mon Nov 26 11:24:58 2007
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EB81516A418;
	Mon, 26 Nov 2007 11:24:58 +0000 (UTC) (envelope-from des@des.no)
Received: from tim.des.no (tim.des.no [194.63.250.121])
	by mx1.freebsd.org (Postfix) with ESMTP id 9C08213C455;
	Mon, 26 Nov 2007 11:24:58 +0000 (UTC) (envelope-from des@des.no)
Received: from tim.des.no (localhost [127.0.0.1])
	by spam.des.no (Postfix) with ESMTP id 99DEA2089;
	Mon, 26 Nov 2007 12:24:49 +0100 (CET)
X-Spam-Tests: AWL
X-Spam-Learn: disabled
X-Spam-Score: -0.1/3.0
X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on tim.des.no
Received: from ds4.des.no (des.no [80.203.243.180])
	by smtp.des.no (Postfix) with ESMTP id 1834C2085;
	Mon, 26 Nov 2007 12:24:49 +0100 (CET)
Received: by ds4.des.no (Postfix, from userid 1001)
	id DDC1984485; Mon, 26 Nov 2007 12:24:48 +0100 (CET)
From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no>
To: John Birrell <jb@what-creek.com>
References: <200711232354.lANNsjmU040755@repoman.freebsd.org>
	<47476A52.8040508@FreeBSD.org> <20071124001008.GA44735@what-creek.com>
Date: Mon, 26 Nov 2007 12:24:48 +0100
In-Reply-To: <20071124001008.GA44735@what-creek.com> (John Birrell's message
	of "Sat\, 24 Nov 2007 00\:10\:08 +0000")
Message-ID: <861wad5jwf.fsf@ds4.des.no>
User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.1 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Cc: cvs-src@FreeBSD.org, Kris Kennaway <kris@FreeBSD.org>,
	John Birrell <jb@FreeBSD.org>, cvs-all@FreeBSD.org,
	src-committers@FreeBSD.org
Subject: Re: cvs commit: src/contrib/binutils/opcodes ppc-dis.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Nov 2007 11:24:59 -0000

John Birrell <jb@what-creek.com> writes:
> On Sat, Nov 24, 2007 at 01:03:30AM +0100, Kris Kennaway wrote:
> > Usually we try to avoid taking files off the vendor branch, it
> > causes trouble for the person doing the vendor imports :(
> I think it's a change that doesn't need to be merged. If a new version is
> imported, _that_ needs to be build clean.

Changes that don't need to be merged are normally committed to the
vendor branch.  Having a file off the vendor branch will cause trouble
during future imports regardless of whether there are changes to merge.

DES
--=20
Dag-Erling Sm=C3=B8rgrav - des@des.no