From owner-cvs-src@FreeBSD.ORG  Tue Sep  9 08:19:37 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 731B216A4BF; Tue,  9 Sep 2003 08:19:37 -0700 (PDT)
Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 2607C43FE0; Tue,  9 Sep 2003 08:19:36 -0700 (PDT)
	(envelope-from obrien@dragon.nuxi.com)
Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1])
	by dragon.nuxi.com (8.12.9/8.12.9) with ESMTP id h89FJYnW060033;
	Tue, 9 Sep 2003 08:19:34 -0700 (PDT)
	(envelope-from obrien@dragon.nuxi.com)
Received: (from obrien@localhost)
	by dragon.nuxi.com (8.12.9/8.12.9/Submit) id h89FJUB9060031;
	Tue, 9 Sep 2003 08:19:30 -0700 (PDT)
	(envelope-from obrien)
Date: Tue, 9 Sep 2003 08:19:30 -0700
From: "David O'Brien" <obrien@FreeBSD.org>
To: Philippe Charnier <charnier@xp11.frmug.org>
Message-ID: <20030909151930.GA59840@dragon.nuxi.com>
References: <20030908053202.GI695@roark.gnf.org>
	<200309090358.h893wQjt022577@xp11.frmug.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200309090358.h893wQjt022577@xp11.frmug.org>
User-Agent: Mutt/1.4.1i
X-Operating-System: FreeBSD 5.1-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
cc: Gordon Tetlow <gordont@gnf.org>
cc: src-committers@FreeBSD.org
cc: cvs-all@FreeBSD.org
cc: cvs-src@FreeBSD.org
Subject: Re: cvs commit: src/sbin/rcorder rcorder.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: obrien@FreeBSD.org
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: Tue, 09 Sep 2003 15:19:37 -0000

On Tue, Sep 09, 2003 at 05:58:26AM +0200, Philippe Charnier wrote:
> Salut,
> 
> Gordon Tetlow <gordont@gnf.org> wrote:
> 
> >> charnier    2003/09/07 07:17:17 PDT
> >>=20
> >>   FreeBSD src repository
> >>=20
> >>   Modified files:
> >>     sbin/rcorder         rcorder.c=20
> >>   Log:
> >>   de-__P().
> >>  =20
> >>   Revision  Changes    Path
> >>   1.2       +27 -22    src/sbin/rcorder/rcorder.c
> >
> >Argh! This was on the vendor branch! Did you pass this by obrien@ first?
> 
> Oh Sorry, I didn't check that HEAD was on the vendor branch. I should
> have made a first commit to incorporate 1.1.1.1 -> 1.1.1.2 from the
> vendor branch to the main trunk before committing my own change on top
> of it.

??  1.1.1.2 was already the HEAD revision.  When you made a change to
something on the vendor branch


> My patch is revision 1.2 and contains both 1.1.1.1 -> 1.1.1.2 and my
> changes.
> 
> I checked
> # grep rcorder /usr/src/MAINTAINERS 

It isn't under strict maintainership as we might have to make
FreeBSD-specific changes to get it to do what we want it to.  BUT that
does not mean we should strive to make gratious differences to the NetBSD
code.