Date: Tue, 9 Sep 2003 08:19:30 -0700 From: "David O'Brien" <obrien@FreeBSD.org> To: Philippe Charnier <charnier@xp11.frmug.org> Cc: cvs-src@FreeBSD.org Subject: Re: cvs commit: src/sbin/rcorder rcorder.c Message-ID: <20030909151930.GA59840@dragon.nuxi.com> In-Reply-To: <200309090358.h893wQjt022577@xp11.frmug.org> References: <20030908053202.GI695@roark.gnf.org> <200309090358.h893wQjt022577@xp11.frmug.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030909151930.GA59840>