From owner-p4-projects@FreeBSD.ORG  Mon May 29 15:45:13 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E829F16AFD7; Mon, 29 May 2006 15:45:08 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F146916AFC8
	for <perforce@freebsd.org>; Mon, 29 May 2006 15:45:07 +0000 (UTC)
	(envelope-from hselasky@c2i.net)
Received: from mail45.e.nsc.no (mail45.e.nsc.no [193.213.115.45])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8BB7643D8A
	for <perforce@freebsd.org>; Mon, 29 May 2006 15:44:56 +0000 (GMT)
	(envelope-from hselasky@c2i.net)
Received: from [10.0.0.2] (ti131310a080-14577.bb.online.no [85.165.248.241])
	by mail45.nsc.no (8.13.6/8.13.5) with ESMTP id k4TFie56028481
	for <perforce@freebsd.org>; Mon, 29 May 2006 17:44:41 +0200 (CEST)
From: Hans Petter Selasky <hselasky@c2i.net>
To: Perforce Change Reviews <perforce@freebsd.org>
Date: Mon, 29 May 2006 17:44:43 +0200
User-Agent: KMail/1.7
References: <200605272150.k4RLo9Aw026648@repoman.freebsd.org>
	<20060528133943.N79162@fledge.watson.org>
In-Reply-To: <20060528133943.N79162@fledge.watson.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200605291744.43653.hselasky@c2i.net>
Cc: 
Subject: Re: PERFORCE change 97970 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 May 2006 15:45:21 -0000

On Sunday 28 May 2006 14:40, Robert Watson wrote:
> On Sat, 27 May 2006, Hans Petter Selasky wrote:
> > http://perforce.freebsd.org/chv.cgi?CH=97970
> >
> > Change 97970 by hselasky@hselasky_mini_itx on 2006/05/27 21:49:24
> >
> >  Copied old USB files into "/sys/dev/usb.old" for reference. Prepared
> > "/sys/conf/files" for new USB system.
>
> For future reference, you might want to instead add an additional entry in
> the branch definition for your branch such that the FreeBSD vendor USB code
> is merged to that directory in your branch.  That way the usb.old tree
> would continue to track changes from the FreeBSD vendor tree when you
> integrate. You can still set this up, but it might require slight massaging
> during the first integration.

Ok. I am not that good at p4 yet, and I would need some help to do it. My idea 
was to do a "diff" when the integration process is done and see what patches 
was missed.

--HPS