Date: Sat, 26 Apr 2008 08:11:51 -0400 From: John Baldwin <jhb@freebsd.org> To: John Birrell <jb@what-creek.com> Cc: cvs-src@freebsd.org, Alexey Dokuchaev <danfe@freebsd.org>, John Birrell <jb@freebsd.org>, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/cddl/contrib/opensolaris/lib/libdtrace/common dt_cc.c dt_cg.c dt_consume.c Message-ID: <200804260811.51598.jhb@freebsd.org> In-Reply-To: <20080426090005.GE17883@what-creek.com> References: <200804260509.m3Q59JgG016417@repoman.freebsd.org> <20080426085357.GB38431@FreeBSD.org> <20080426090005.GE17883@what-creek.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Saturday 26 April 2008 05:00:05 am 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. > > The commit that takes the files off the vendor branch makes them version > 1.2 and it effectively matches my reference tree from p4, hence "no change" > or +0-0. > > It's just the way that cvs reports it. Normally just the raw vendor sources get imported on the vendor branches which is why no other merges of 3rd party sources have done this in the past. On a slightly related note, for some reason I didn't get most of the cvs import e-mails, including all the e-mails for the 1.1.1.2 import (though cvsweb says they are there). -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804260811.51598.jhb>