Date: Thu, 26 Jun 2014 03:16:07 -0500 From: Pedro Giffuni <pfg@freebsd.org> To: Rui Paulo <rpaulo@FreeBSD.org> Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Andriy Gapon <avg@freebsd.org> Subject: Re: svn commit: r267898 - in head: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs cddl/contrib/opensolaris/lib/libdtrace/common sys/cddl/contrib/opensolaris/uts/common/sys Message-ID: <A70E8606-2805-4A58-BA6E-C8235F6E8F4A@freebsd.org> In-Reply-To: <53ABC9FE.4000107@FreeBSD.org> References: <201406260706.s5Q76hYW014217@svn.freebsd.org> <53ABC9FE.4000107@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Il giorno 26/giu/2014, alle ore 02:21, Andriy Gapon <avg@freebsd.org> ha = scritto: > On 26/06/2014 11:06, Rui Paulo wrote: >> Author: rpaulo >> Date: Thu Jun 26 07:06:43 2014 >> New Revision: 267898 >> URL: http://svnweb.freebsd.org/changeset/base/267898 >>=20 >> Log: >> Bring the following change from the illumos-joyent repository: >>=20 >> commit 78e24ab6803bbe11ba37642624e1498ede5b239d >> Author: Bryan Cantrill <bryan@joyent.com> >> Date: Thu Oct 31 01:20:54 2013 >>=20 >> OS-1688 DTrace count() with histogram >> OS-2360 DTrace full width distribution histograms >> OS-2361 DTrace frequency trails >>=20 >> MFC after: 2 weeks >=20 > Seems like this change is in illumos already: >=20 > commit 33093f5bcdc51014933497dd39374080c1ac5705 > Author: Bryan Cantrill <bryan@joyent.com> > Date: Thu Oct 31 08:20:54 2013 +0000 >=20 > 4471 DTrace count() with histogram > 4472 DTrace full width distribution histograms > 4473 DTrace frequency trails > Reviewed by: Dan McDonald <danmcd@omniti.com> > Approved by: Gordon Ross <gwr@nexenta.com> >=20 > As such it would have been preferable to use our standard workflow and > merge the change via the illumos vendor area. >=20 Indeed, this change is in the vendor area: http://svnweb.freebsd.org/base?view=3Drevision&revision=3D266992 However the commit is wrong because: 1) It added files instead of copying them from/through the vendor area. 2) It is not respecting the order in which upstream (Illumos AFAICT) = adds features so it breaks the sense of DT_VERS_LATEST I am aware that DTrace imports have not been respecting the regular = merging procedure but we are trying to work on that. Please fix at least = (1), (2) implies merging three commits that precede this one.=20 Pedro.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?A70E8606-2805-4A58-BA6E-C8235F6E8F4A>