Date: Tue, 5 Jul 2016 12:59:43 -0700 From: Russell Haley <russ.haley@gmail.com> To: Carsten Larsen <cs@innolan.dk> Cc: Ivan Radovanovic <radovanovic@gmail.com>, Freebsd-mono <freebsd-mono@freebsd.org>, Mathieu Prevot <mathieu.prevot@gmail.com>, =?UTF-8?Q?Romain_Tarti=C3=A8re?= <romain@blogreen.org> Subject: Re: Maintaining mono/.net Message-ID: <CABx9NuQJkojmSSN9bef_732uNC9mtRzOzK52q=XoOPmgASLv3A@mail.gmail.com> In-Reply-To: <577BF87C.5030907@innolan.dk> References: <CABx9NuSwbf2jwyqcGNGeyWjJ4pbVFmCiGO=i172UDFy2=yGPOw@mail.gmail.com> <20160628094307.bepxy46dp5igizeh@ivaldir.etoilebsd.net> <CABx9NuTPgGqansvnFNxRUhsagh3x=o4W7%2B7UUxORkGpzZVTJUA@mail.gmail.com> <1526452.AT2qT6pE07@dragon.local> <20160629195854.4698194.67297.7966@gmail.com> <CABx9NuQrDjqr2rUDsLY7g7fVO1b-3o_=SLR5A0FAYbt37K3t-Q@mail.gmail.com> <577BCCE9.10504@gmail.com> <577BF87C.5030907@innolan.dk>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Jul 5, 2016 at 11:12 AM, Carsten Larsen <cs@innolan.dk> wrote: > ON 05-07-2016 kl. 17:06 Ivan Radovanovic wrote: >> >> >> I had some spare time during weekend so I was playing little bit with >> mono - I cloned mono repository, then branched "freebsd" from their 4.4 >> branch (which is maybe also nice coincidence (freebsd and bsd4.4)), then >> I merged all our changes in that branch - I added Romain's patches to >> eglib, I added my implementation of FS watcher to System.dll, I also >> added test for FS watcher to test cases (so hopefully it will be easier >> to spot errors), I also fixed just couple of warning in C code they have >> in main mono source (there are many warnings there, some look serious to >> me - my plan is to keep reducing their number). >> > > It sounds like a good start. 4.4.0 could be our head (read: master). > >> Instead of changing their Kevent watcher implementation I added this one >> as completely new FS watcher (FreeBSD watcher), and I modified >> mono/metadata/filewatcher.c to always use this watcher when compiled on >> FreeBSD (I don't know about kevent implementation on other BSDs - maybe >> FreeBSD implementation should be used there as well). >> >> All mono tests pass (running gmake check), but those related to profiler >> (they segfault in native code - I am planning to investigate that >> further). >> >> Btw, I am configuring mono with: >> >> ./configure --disable-dtrace --with-checked-build=3Dyes >> >> since if I leave dtrace enabled I get billion linking errors later (I >> will investigate that at certain point as well). >> >> Now, the question is how I push these changes to repository Russ created >> (is that repository we want to use for this project)? I am also not >> familiar enough with git to know if this setup now will work (we were >> talking to have our local repositories to talk to main mono repository >> for reading, and our (fbsd) repository for writing (to keep patches), >> now actual setup is that repository Russ created is forked from mono (I >> don't know if that changes anything)). Maybe somebody can clarify this? >> >> Kind regards, >> Ivan > > > The fork in github.com/FreeBSD-DotNet/mono made by Russ is forked directl= y > from master. Its not really a candidate for merging. > > If you would like to push those changes to github.com/FreeBSD-DotNet/mono > you would first need to make your own user of github. With this user you = can > fork mono again and then clone you own mono repository to you local PC. > Transfer your changes this this local repository and commit at usual. > > Or Russ could make a new fork on github equivalent to: > git clone -b mono-4.4.0-branch https://github.com/mono/mono.git Ivan has just answered alot of this and is now on the freebsd-dotnet team. Here were my thoughts: I think all Ivan needs to do is: git remote set-url origin https://github.com/freebsd-dotnet/mono.git then to verify: git remote -v and then git-commit and git-push Instructions are here: https://help.github.com/articles/changing-a-remote-s-url/#platform-linux However I think that will break things because we are 60 commits behind head and 4 behind the 4.4 branch. I will update the repository tonight. OR Ivan can do a git-diff on the current repository, clone the FreeBSD-dotnet repository and then apply the patch using git-apply https://git-scm.com/docs/git-diff https://git-scm.com/docs/git-apply (old news: I've sent an freebsd-dotnet invitation to the Ivan Radovanovic user just in case.) > Then he could invite you (read: your github user) as a collaborate of thi= s > new repository. You would then be able to push your changes directly to > github.com/FreeBSD-DotNet/mono-dev (or whatever name is chosen). > > It could be a nice experiment but as Romain Tarti=C3=A8re mentioned earli= er in > the thread we are not suppose to break any existing mono ports. I don=E2= =80=99t know > how to validate all the existing ports against a new release (candidate) = but > I assume it would be done using poudriere. A list can be seen at http://www.freshports.org/search.php?stype=3Ddepends_run&method=3Dmatch&que= ry=3Dmono&num=3D10&orderby=3Dcategory&orderbyupdown=3Dasc&search=3DSearch and we can work on the plan to get that going. I suggest we document these ideas in https://github.com/FreeBSD-DotNet/Developer-Wiki/wiki Cheers, Russ
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CABx9NuQJkojmSSN9bef_732uNC9mtRzOzK52q=XoOPmgASLv3A>