Date: Sun, 27 Apr 2008 10:51:05 -0700 From: Sam Leffler <sam@freebsd.org> To: obrien@freebsd.org Cc: Alexey Dokuchaev <danfe@freebsd.org>, src-committers@freebsd.org, cvs-src@freebsd.org, cvs-all@freebsd.org, John Birrell <jb@freebsd.org>, John Birrell <jb@what-creek.com> Subject: Re: cvs commit: src/cddl/contrib/opensolaris/lib/libdtrace/common dt_cc.c dt_cg.c dt_consume.c Message-ID: <4814BD09.8090000@freebsd.org> In-Reply-To: <20080427052339.GB21702@dragon.NUXI.org> References: <200804260509.m3Q59JgG016417@repoman.freebsd.org> <20080426085357.GB38431@FreeBSD.org> <20080426090005.GE17883@what-creek.com> <20080427052339.GB21702@dragon.NUXI.org>
next in thread | previous in thread | raw e-mail | index | archive | help
David O'Brien wrote:
> On Sat, Apr 26, 2008 at 09:00:05AM +0000, John Birrell wrote:
>
>> On Sat, Apr 26, 2008 at 08:53:57AM +0000, Alexey Dokuchaev wrote:
>>
>>> On Sat, Apr 26, 2008 at 05:09:19AM +0000, John Birrell wrote:
>>>
>>>> jb 2008-04-26 05:09:19 UTC
>>>>
>>>> FreeBSD src repository
>>>>
>>>> Modified files:
>>>> cddl/contrib/opensolaris/lib/libdtrace/common dt_cc.c dt_cg.c
>>>> dt_consume.c
>>>> Log:
>>>> * Handle the different ioctl design.
>>>> * Add a couple of FreeBSD action extensions.
>>>>
>>>> Revision Changes Path
>>>> 1.2 +0 -0 src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
>>>> 1.2 +0 -0 src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c
>>>> 1.2 +0 -0 src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
>>>>
>>> John, can you enlighten please why a bunch of your recent commits are +0
>>> -0 changes? Am I missimg something obvious?
>>>
>> My reference is the tree from p4. I chose to import that as 1.1.1.1 on
>> the vendor branch and then a second import of the raw OpenSolaris files
>> which will be 1.1.1.2 if they differ from my reference.
>>
>
> This is back-asswards. I've offered to help you with the imports - even
> do them for you. I wish you would have takee me up on it...
> Including giving you 'cvs import -X' behavior.
>
> If I understand correctly, the rev 1.1.1.1 files are the OpenSolaris
> files with changes by you in them?
>
>
Yes, what he's done appears totally useless. Not sure how best to
recover except to rip everything out and start over.
Sam
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4814BD09.8090000>