Date: Mon, 2 Jul 2012 14:09:31 -0700 From: "David O'Brien" <obrien@FreeBSD.org> To: Doug Barton <dougb@FreeBSD.org> Cc: svn-src-head@FreeBSD.org, George Neville-Neil <gnn@neville-neil.com>, pfg@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r237624 - in head: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize cddl/contrib/opensolaris/lib/libdtrace/common sys/cddl/contrib/opensolaris/uts/common/dtrace sys/cddl/c... Message-ID: <20120702210931.GB85618@dragon.NUXI.org> In-Reply-To: <4FF11659.8060405@FreeBSD.org> References: <1340992732.19144.YahooMailClassic@web113501.mail.gq1.yahoo.com> <4FF11659.8060405@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Jul 01, 2012 at 08:32:41PM -0700, Doug Barton wrote: > On 06/29/2012 10:58, Pedro Giffuni wrote: > > Now .. David pointed out I am not respecting the code > > provenance since I didn't add them to the opensolaris > > vendor area, but these files are copyrighted Joyent > > Inc (not even Illumos) so I cannot put them there > > unless we create a new vendor for Joyent > > Creating a new vendor area would be the right solution, yes. I totally disagree -- it will cause a real pain merging. Think about it -- if we import a new code drop of uts/common/fs/zfs/*.c into '^/vendor-sys/illumos', how do we merge that to HEAD? I don't believe 'svn merge -c <GRN>' will work because we already have a different uts/common/fs/zfs/*.c from ^/vendor-sys/opensolaris. I think we either need to just call Illumos OpenSolaris for these purposes, or 'svn move opensolaris illumos'. I think this needs to be discussed with the Repo Meisters. -- -- David (obrien@FreeBSD.org)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120702210931.GB85618>