Date: Tue, 3 Jul 2012 08:09:35 -0700 (PDT) From: Pedro Giffuni <pfg@freebsd.org> To: David O'Brien <obrien@FreeBSD.org>, gnn@freebsd.org Cc: arch@freebsd.org, Doug Barton <dougb@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: <1341328175.90641.YahooMailClassic@web113519.mail.gq1.yahoo.com> In-Reply-To: <86mx3gdhlk.wl%gnn@neville-neil.com>
next in thread | previous in thread | raw e-mail | index | archive | help
=0A=0A--- Mar 3/7/12, gnn@freebsd.org <gnn@freebsd.org> ha scritto:=0A...= =0A> Again, moving to arch@=0A> =0A> At Mon, 2 Jul 2012 14:09:31 -0700,=0A>= David O'Brien wrote:=0A> > =0A> > On Sun, Jul 01, 2012 at 08:32:41PM -0700= , Doug Barton=0A> wrote:=0A> > > On 06/29/2012 10:58, Pedro Giffuni wrote:= =0A> > > > Now .. David pointed out I am not respecting the code=0A> > > > = provenance since I didn't add them to the opensolaris=0A> > > > vendor area= , but these files are copyrighted Joyent=0A> > > > Inc (not even Illumos) s= o I cannot put them there=0A> > > > unless we create a new vendor for Joyen= t=0A> > > =0A> > > Creating a new vendor area would be the right solution, = yes.=0A> > =0A> > I totally disagree -- it will cause a real pain merging.= =0A> > =0A=0AThe idea was to keep in order the code provenance issue.=0AIll= umos is not a vendor: the changes are copyrighted=0Aindividually by Nexenta= , Joyent, Delphix and others=0Aand if we want to track IP property for what= ever reason=0Ait's convenient to have it separate from the OpenSolaris=0Ast= uff.=0A=0AConcerning the multiple vendor issue if time proves that=0Aopenso= laris is dead then we don't have a problem and we=0Acan just drop that bran= ch. I suspect that if OpenSolaris=0Asomehow resurrects Illumos will have to= deal with it too.=0A(so yes, I guess I am starting to agree with David).= =0A=0A> > Think about it -- if we import a new code drop of=0A> > uts/commo= n/fs/zfs/*.c into=0A> > '^/vendor-sys/illumos', how do we merge that to HEA= D?=0A> > =0A> > I don't believe 'svn merge -c <GRN>' will work=0A> > becaus= e we already have a=0A> > different uts/common/fs/zfs/*.c from ^/vendor-sys= /opensolaris.=0A> > =0A> > I think we either need to just call Illumos Open= Solaris for these=0A> > purposes, or 'svn move opensolaris illumos'.=0A> > = =0A> > I think this needs to be discussed with the Repo Meisters.=0A> =0A> = I actually agree with Doug here, but not strongly, I'd prefer to be=0A> bet= ter educated about this topic.=A0 Do our Repo Meisters=0A> read arch@?=0A> = =0A=0ADoing a copy we preserve the opensolaris branch information,=0Adoing = a rename we can always branch a new opensolaris again=0Afrom a specific rev= ision if we want to.=0A=0AFWIW, I think it's actually the same to do a copy= or a rename,=0Abut I guess I can be re-educated too.=0A=0AThe "svn copy" w= as already done though so I wonder if=0Areworking it is really necessary.= =0A=0APedro.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1341328175.90641.YahooMailClassic>