<div dir="auto"><div>Troy,<div dir="auto"><br></div><div dir="auto">I know we've discussed the merge issue in the past. In order to help point in the right direction, a couple of questions:</div><div dir="auto"><br></div><div dir="auto">Do you still envision self hosting the repository as you have SVN and using GitHub to mirror, or do you anticipate self hosting a repository that is just an insurance policy against GitHub becoming unfriendly in the future? Most popular self hosting Git supports both push and pull to GitHub repositories, but the one you anticipate being the source will determine the recommendations and conversion path.</div><div dir="auto"><br></div><div dir="auto">In the Git world, the feature you're looking at seems to be known as Code Owners. It's a relatively newer feature. Here is GitHub documentation about their implementation. <a href="Https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners">Https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners</a></div><div dir="auto"><br></div><div dir="auto">If you anticipate doing most of the work on a self hosted solution and pushing GitHub as the mirror, I can look for their technique.</div><div dir="auto"><br></div><div dir="auto">I'll look into the Crosswire organization on GitHub to see if I have admin rights there to address #1.</div><div dir="auto"><br></div>--Greg<br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Mar 17, 2023, 14:09 Troy A. Griffitts <<a href="mailto:scribe@crosswire.org">scribe@crosswire.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div>
<p>I don't want this to turn into a debate.<br>
<br>
I agree, we need to move source control to git.</p>
<p>I even mostly agree we should do most of our dev work on github
for the visibility to draw other developers.</p>
<p>To move forward with this:</p>
<p>1) I would actually need access to the github 'crosswire'
organization, which I currently don't have.</p>
<p>2) I am happy to migrate our 27 repos there (yes, I was also
surprised we have 27, but even these old ones would be nice to
have on github for posterity).<br>
3) After #2, I would love for Github experts to help me find a
solution that effectively grant elevated access to individuals for
merging PRs into our master repository without my approval FOR
CERTAIN PARTS OF THE REPO they own or are trusted to approve.</p>
<p>This #3 item had been the primary element holding us back from
moving from SVN to git. If you are unaware, SVN has a very easy
way to elevate permissions for accounts for parts of the
repository. I don't want to have to approve all changes! I trust
our pumpkin holders to care for their parts of the repository.</p>
<p>We've discussed, in the past, submodules for handle this, but
they do not handle this well. e.g., I want to grant Greg Hellings
full write access to merge any PR which updates any of our cmake
scripts in all folders everywhere. I don't know anything about
cmake and Greg is an expert. I want him to be able to manage that
build system without my oversight. I trust him. I do not want to
grant Greg merge access for code that has anything to do with our
C++ engine. He might be a great C++ programmer, but he hasn't
expressed he wants that access or ever submitted C++ code for me
to review and merge myself, so I want to protect Greg from
accidentally merging in someone's PR which includes C++ engine
code.</p>
<p>In SVN this is easy. Attached is our SVN access file. Help me
translate this workflow to Github. There must be some way to
restrict merges based on the merging user and files modified in
the PR. Or at least require a review by certain users bases on
the files modified in the PR.</p>
<p>Help me :)</p>
<p>Troy<br>
</p>
<p><br>
</p>
<div>On 3/17/23 11:24, Greg Hellings wrote:<br>
</div>
<blockquote type="cite">
<div dir="auto">Indeed. It's not a principled stand that I'm
refusing to get Subversion going. It's simply that it's too much
work that I haven't bothered and don't foresee doing so anytime
soon.
<div dir="auto"><br>
</div>
<div dir="auto">And, with no setup to automatically test the
scripts in all the environments they must support, it's not
likely others are willing to commit this on my behalf.<br>
<div dir="auto"><br>
</div>
<div dir="auto">--Greg</div>
</div>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Sun, Mar 12, 2023, 09:42
Peter von Kaehne <<a href="mailto:refdoc@gmx.net" target="_blank" rel="noreferrer">refdoc@gmx.net</a>>
wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="auto">I think you misunderstood Greg.
<div><br>
</div>
<div>There is a long campaign and strong feeling to have the
project on Git but there is no agreement or movement to
that. And it seems Greg is pausing his contributions until
that matter is resolved. </div>
<div><br>
</div>
<div>Peter<br>
<br>
<div dir="ltr">Sent from my phone. Please forgive
misspellings and weird “corrections”</div>
<div dir="ltr"><br>
<blockquote type="cite">On 12 Mar 2023, at 15:51, ZdPo
Ster <<a href="mailto:zdposter@gmail.com" rel="noreferrer noreferrer" target="_blank">zdposter@gmail.com</a>>
wrote:<br>
<br>
</blockquote>
</div>
<blockquote type="cite">
<div dir="ltr">
<div dir="ltr">
<div>I am sorry, but I did not get the point of your
reply.</div>
<div>I do not use subversion - I use git-svn as
proposed several months ago on this forum. But
current cmake configuration expects everybody to
use subversion, which is wrong.<br>
</div>
<div>These patches improve cmake build:</div>
<div>
<ul>
<li> that will work also with git-svn <br>
</li>
<li>MSVC build</li>
<li>fix depreciated</li>
</ul>
<div>AFAIK it should cause no harm for other
combinations, just improve current state.</div>
<div><br>
</div>
<div>Zdenko<br>
</div>
</div>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Thu, 9 Mar 2023
at 23:18, Greg Hellings <<a href="mailto:greg.hellings@gmail.com" rel="noreferrer noreferrer" target="_blank">greg.hellings@gmail.com</a>>
wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div dir="ltr">
<div>I've never bothered to get Subversion setup
on my local machine. Remembering the setup,
plus my credentials, and how to use it is more
labor than I've been willing to spend on this
effort. If, in the future, I overcome that
inertia then I'll happily test and apply this
patch.</div>
<div><br>
</div>
<div>--Greg<br>
</div>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Sat, Feb
25, 2023 at 5:34 AM ZdPo Ster <<a href="mailto:zdposter@gmail.com" rel="noreferrer noreferrer" target="_blank">zdposter@gmail.com</a>>
wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div dir="ltr">
<div>Any update on this (after 3.5 months)?</div>
<div><br>
</div>
<div>Zdenko<br>
</div>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Sat, 26
Nov 2022 at 21:53, Greg Hellings <<a href="mailto:greg.hellings@gmail.com" rel="noreferrer noreferrer" target="_blank">greg.hellings@gmail.com</a>>
wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div dir="auto">Thanks. I am not privy to
the patches email inbox, so this mailing
list is the way to reach me for CMake
things. I'll review these when I have
the opportunity.
<div dir="auto"><br>
</div>
<div dir="auto">--Greg</div>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On
Sat, Nov 26, 2022, 13:46 Peter von
Kaehne <<a href="mailto:refdoc@gmx.net" rel="noreferrer noreferrer" target="_blank">refdoc@gmx.net</a>>
wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div dir="auto"><br>
<blockquote type="cite">
<div dir="ltr">
<div dir="ltr">
<div>How to suggest
improvements to the sword
project?</div>
</div>
</div>
</blockquote>
<div><br>
</div>
<div><br>
</div>
You did it the right way. It just is
a bit on/off as a project. GHellings
is the cmake pumpkin holder as far
as I know. I bcc him on a different
email address.
<div><br>
</div>
<div>Peter<br>
<div><br>
</div>
<div><br>
</div>
<div>
<blockquote type="cite">
<div dir="ltr">
<div dir="ltr">
<div><br>
</div>
<div>BR,</div>
<div><br>
</div>
<div>Zdenko<br>
</div>
<div><br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">----------
Forwarded message
---------<br>
From: <b class="gmail_sendername" dir="auto">ZdPo
Ster</b> <span dir="auto"><<a href="mailto:zdposter@gmail.com" rel="noreferrer noreferrer noreferrer" target="_blank">zdposter@gmail.com</a>></span><br>
Date: Sun, 6 Nov
2022 at 22:22<br>
Subject: cmake
patches<br>
To: <<a href="mailto:patches@crosswire.org" rel="noreferrer
noreferrer noreferrer" target="_blank">patches@crosswire.org</a>><br>
</div>
<br>
<br>
<div dir="ltr">
<div>Hello,</div>
<div><br>
</div>
<div>please find 3
few patches
related to cmake
build (tested
on windows with
MSVC 2019):</div>
<div>
<ol>
<li>cmake_fix_deprecation.patch
- cmake
version 3.23.2
produce
depreciation
warning for
old minimum
version, co
IMO it is time
to increase
expected cmake
version</li>
<li>cmake_fix_msvc.patch
- there is no
"/O3" options
in current
MSVC[1]</li>
<li>cmake_git_svn.patch
- I use git
svn for
accessing
code, but
cmake produce
error because
of missing svn
executable. He
is patch that
fixed it +
code for
detecting svn
revision
(MYSVN_WC_REVISION)
from git</li>
</ol>
<div>[1] <a href="https://learn.microsoft.com/en-us/cpp/build/reference/o-options-optimize-code?view=msvc-160" rel="noreferrer noreferrer noreferrer" target="_blank">https://learn.microsoft.com/en-us/cpp/build/reference/o-options-optimize-code?view=msvc-160</a></div>
<div><br>
</div>
<div>Zdenko<br>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</blockquote>
</div>
</div>
</div>
<div dir="auto">
<div>
<div>
<blockquote type="cite">
<div dir="ltr"><span>_______________________________________________</span><br>
<span>sword-devel mailing
list: <a href="mailto:sword-devel@crosswire.org" rel="noreferrer
noreferrer noreferrer" target="_blank">sword-devel@crosswire.org</a></span><br>
<span><a href="http://crosswire.org/mailman/listinfo/sword-devel" rel="noreferrer
noreferrer noreferrer" target="_blank">http://crosswire.org/mailman/listinfo/sword-devel</a></span><br>
<span>Instructions to
unsubscribe/change your
settings at above page</span><br>
</div>
</blockquote>
</div>
</div>
</div>
</blockquote>
</div>
_______________________________________________<br>
sword-devel mailing list: <a href="mailto:sword-devel@crosswire.org" rel="noreferrer noreferrer" target="_blank">sword-devel@crosswire.org</a><br>
<a href="http://crosswire.org/mailman/listinfo/sword-devel" rel="noreferrer noreferrer noreferrer" target="_blank">http://crosswire.org/mailman/listinfo/sword-devel</a><br>
Instructions to unsubscribe/change your
settings at above page<br>
</blockquote>
</div>
_______________________________________________<br>
sword-devel mailing list: <a href="mailto:sword-devel@crosswire.org" rel="noreferrer noreferrer" target="_blank">sword-devel@crosswire.org</a><br>
<a href="http://crosswire.org/mailman/listinfo/sword-devel" rel="noreferrer noreferrer noreferrer" target="_blank">http://crosswire.org/mailman/listinfo/sword-devel</a><br>
Instructions to unsubscribe/change your
settings at above page<br>
</blockquote>
</div>
_______________________________________________<br>
sword-devel mailing list: <a href="mailto:sword-devel@crosswire.org" rel="noreferrer noreferrer" target="_blank">sword-devel@crosswire.org</a><br>
<a href="http://crosswire.org/mailman/listinfo/sword-devel" rel="noreferrer noreferrer noreferrer" target="_blank">http://crosswire.org/mailman/listinfo/sword-devel</a><br>
Instructions to unsubscribe/change your settings
at above page<br>
</blockquote>
</div>
<span>_______________________________________________</span><br>
<span>sword-devel mailing list: <a href="mailto:sword-devel@crosswire.org" rel="noreferrer noreferrer" target="_blank">sword-devel@crosswire.org</a></span><br>
<span><a href="http://crosswire.org/mailman/listinfo/sword-devel" rel="noreferrer noreferrer" target="_blank">http://crosswire.org/mailman/listinfo/sword-devel</a></span><br>
<span>Instructions to unsubscribe/change your settings
at above page</span><br>
</div>
</blockquote>
</div>
</div>
_______________________________________________<br>
sword-devel mailing list: <a href="mailto:sword-devel@crosswire.org" rel="noreferrer noreferrer" target="_blank">sword-devel@crosswire.org</a><br>
<a href="http://crosswire.org/mailman/listinfo/sword-devel" rel="noreferrer noreferrer noreferrer" target="_blank">http://crosswire.org/mailman/listinfo/sword-devel</a><br>
Instructions to unsubscribe/change your settings at above page<br>
</blockquote>
</div>
<br>
<fieldset></fieldset>
<pre>_______________________________________________
sword-devel mailing list: <a href="mailto:sword-devel@crosswire.org" target="_blank" rel="noreferrer">sword-devel@crosswire.org</a>
<a href="http://crosswire.org/mailman/listinfo/sword-devel" target="_blank" rel="noreferrer">http://crosswire.org/mailman/listinfo/sword-devel</a>
Instructions to unsubscribe/change your settings at above page
</pre>
</blockquote>
</div>
_______________________________________________<br>
sword-devel mailing list: <a href="mailto:sword-devel@crosswire.org" target="_blank" rel="noreferrer">sword-devel@crosswire.org</a><br>
<a href="http://crosswire.org/mailman/listinfo/sword-devel" rel="noreferrer noreferrer" target="_blank">http://crosswire.org/mailman/listinfo/sword-devel</a><br>
Instructions to unsubscribe/change your settings at above page<br>
</blockquote></div></div></div>