search

mt-mods / playerfactions

GNU General Public License v3.0
2 stars 4 forks source link

Update mirror link + rebase on upstream #6

Open louisroyer opened 2 years ago

louisroyer commented 2 years ago

Hi, could you please update mirror link in the "about" section of the repository to https://leagueh.xyz/git/playerfactions/? The git subdomain doesn't exist anymore and this is annoying. Also, maybe we could rebase the mirror to get the same commit history on the mirror than on upstream (this would make easier to know if the mirror is up-to-date) while preserving local patches.

S-S-X commented 2 years ago

Note that if rebasing to https://leagueh.xyz/git/playerfactions.git or merging any changes done on upstream after 40f6f212 then license will be updated to AGPL while licence obtained for this fork is GPLv3.

Commits we have under GPLv3 license:

77fe095 (HEAD -> master, origin/master, origin/HEAD) nil check patch (#5) 19cb21e add luacheck, workflow and fix some issues 0d19660 fix error in case handling 0c0e754 changed command outcomes in chat message to return string 83a63c1 removed extra parameter 18eef7c Merge pull request #2 from IRI-Research/master 0612afb Add checks on command args to avoid server crashes 639f5aa (origin/main) check if player faction is nil

Commits done to leagueh.xyz, at least last two being under AGPL license:

7e2b190 (leagueh/main) General fixes 40f6f21 Moved from GPL3 to AGPL3 d728794 Updated README eaaba3e Updated credits, it's right now I think?

Note that this creates problem because AGPL is not compatible with GPL. Following copyright strictly makes this complicated but I guess changes here can be merged to upstream assuming that contributors who used GPLv3 will not complain.

I am basically recommending against any merges between repositories before it is clear what other troubles AGPL can cause. (Some other mod projects have some examples of troubles caused by AGPL, mostly about packaging and using in minetest games)

edit. Removed mirror link for now as this is not really mirror currently, link should be corrected and restored either as mirror-of or some kind of based-on-commit link depending on decisions about merging or rejecting license updates.

louisroyer commented 2 years ago

Oh, you are right. If it is too complicated, nevermind… However commits since the fork seems almost trivial (no new feature, only bug-fixes and workflow), so as long as paternity of commit is preserved (this can be done in a merge commit) re-licensing to AGPLv3 may imo not cause any trouble (of course it is best if we had each contributor's agreement). Please note that if upstream add new API, and this fork diverges too much, creating new mods depending on playerfactions will lead us to other kinds of troubles.