Date: Tue, 3 Jul 2012 08:55:11 -0600 From: Warner Losh <imp@bsdimp.com> To: gnn@freebsd.org Cc: Doug Barton <dougb@FreeBSD.org>, arch@freebsd.org, pfg@FreeBSD.org, David O'Brien <obrien@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: <EDA571E5-8B1F-40F9-8222-B92BD3E2DCCA@bsdimp.com> In-Reply-To: <86mx3gdhlk.wl%gnn@neville-neil.com> References: <1340992732.19144.YahooMailClassic@web113501.mail.gq1.yahoo.com> <4FF11659.8060405@FreeBSD.org> <20120702210931.GB85618@dragon.NUXI.org> <86mx3gdhlk.wl%gnn@neville-neil.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Jul 3, 2012, at 8:50 AM, gnn@freebsd.org wrote: > Again, moving to arch@ >=20 > At Mon, 2 Jul 2012 14:09:31 -0700, > David O'Brien wrote: >>=20 >> 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 >>>=20 >>> Creating a new vendor area would be the right solution, yes. >>=20 >> I totally disagree -- it will cause a real pain merging. >>=20 >> 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? >>=20 >> 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. >>=20 >> I think we either need to just call Illumos OpenSolaris for these >> purposes, or 'svn move opensolaris illumos'. >>=20 >> I think this needs to be discussed with the Repo Meisters. >=20 > I actually agree with Doug here, but not strongly, I'd prefer to be > better educated about this topic. Do our Repo Meisters read arch@? I agree with Doug as well. I think that transitioning from one vendor = tree to the other is the right thing to do. Unless we have good, = concrete reasons not to do this, I think the default assumption should = be this is a good idea. I believe that svn merge -c XXX will work because of how mergenotes = work, but I'd appreciate confirmation from our repo masters. I think that having the two different sources is a good thing, should = OpenSolaris ever come back to live and be a viable source of imports. = We need to keep that option open, unless doing so has a real, = demonstrable harm. Warner=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?EDA571E5-8B1F-40F9-8222-B92BD3E2DCCA>