From owner-cvs-all@FreeBSD.ORG Sun Apr 27 17:51:11 2008 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E5B8C1065674; Sun, 27 Apr 2008 17:51:11 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from ebb.errno.com (ebb.errno.com [69.12.149.25]) by mx1.freebsd.org (Postfix) with ESMTP id 498E08FC0A; Sun, 27 Apr 2008 17:51:06 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from trouble.errno.com (trouble.errno.com [10.0.0.248]) (authenticated bits=0) by ebb.errno.com (8.13.6/8.12.6) with ESMTP id m3RHp5Zr028469 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 27 Apr 2008 10:51:05 -0700 (PDT) (envelope-from sam@freebsd.org) Message-ID: <4814BD09.8090000@freebsd.org> Date: Sun, 27 Apr 2008 10:51:05 -0700 From: Sam Leffler Organization: FreeBSD Project User-Agent: Thunderbird 2.0.0.9 (X11/20071125) MIME-Version: 1.0 To: obrien@freebsd.org References: <200804260509.m3Q59JgG016417@repoman.freebsd.org> <20080426085357.GB38431@FreeBSD.org> <20080426090005.GE17883@what-creek.com> <20080427052339.GB21702@dragon.NUXI.org> In-Reply-To: <20080427052339.GB21702@dragon.NUXI.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-DCC-sonic.net-Metrics: ebb.errno.com; whitelist Cc: Alexey Dokuchaev , src-committers@freebsd.org, cvs-src@freebsd.org, cvs-all@freebsd.org, John Birrell , John Birrell Subject: Re: cvs commit: src/cddl/contrib/opensolaris/lib/libdtrace/common dt_cc.c dt_cg.c dt_consume.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Apr 2008 17:51:12 -0000 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