Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resign Maintainership #435

Merged
merged 1 commit into from Jul 9, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions MAINTAINERS
Expand Up @@ -138,10 +138,10 @@ W: http://plugins.geany.org/geanyprj.html
S: Odd Fixes

geanypy
P: Lex Trotman <elextr@gmail.com>
M: Lex Trotman <elextr@gmail.com>
P:
M:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's get technical and review the patch :-).

I actually agree with the "-" part of the patch - having GP version of the plugin maintained by someone else than the upstream author is less than ideal. IMO it would be best having Matthew Brush at the "+" side of the patch if @codebrainz is willing to maintain it.

Otherwise I think it doesn't make sense to keep an unmaintained copy of a maintained plugin in GP.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On 10 June 2016 at 21:36, Jiří Techet notifications@github.com wrote:

In MAINTAINERS
#435 (comment):

@@ -138,10 +138,10 @@ W: http://plugins.geany.org/geanyprj.html
S: Odd Fixes

geanypy
-P: Lex Trotman elextr@gmail.com
-M: Lex Trotman elextr@gmail.com

Let's get technical and review the patch :-).

I actually agree with the "-" part of the patch - having GP version of the
plugin maintained by someone else than the upstream author is less than
ideal. IMO it would be best having Matthew Brush at the "+" side of the
patch if @codebrainz https://github.com/codebrainz is willing to
maintain it.

Otherwise I think it doesn't make sense to keep an unmaintained copy of a
maintained plugin in GP.

​In that case you better remove quite a lot of other plugins that are also
unmaintained.

There is nothing to review. If a later patch adds a maintainer, fine.


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
https://github.com/geany/geany-plugins/pull/435/files/e0d77167b2d9550fbd2e689347a80fb97371004b#r66599694,
or mute the thread
https://github.com/notifications/unsubscribe/AAxgTZWDxN23YrDKLz78C9qDEJCfRBG8ks5qKUwygaJpZM4Ix325
.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

​In that case you better remove quite a lot of other plugins that are also
unmaintained.

But they don't have an upstream version from which they'd diverge.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO it would be best having Matthew Brush at the "+" side of the patch if @codebrainz is willing to maintain it.

I like having separate repo/issues/build system, etc, which is why I kept GeanyPy as external to Geany-Plugins. I don't think every plugin people write should be forced to be in Geany-Plugins. I don't mind formatting patches for changes to upstream so they can be applied to the fork in Geany-Plugins, but it's going to get harder and harder as the fork has diverged significantly from my repo (ex. the proxy plugin stuff, the geany_functions commit, etc).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like having separate repo/issues/build system, etc, which is why I kept GeanyPy as external to Geany-Plugins. I don't think every plugin people write should be forced to be in Geany-Plugins.

Yes, definitely not forced but let's say "strongly suggested" because having a plugin in GP is nice both for users and developers. I don't think there's a problem in having a separate development repo - I think even with this it could be quite easy to copy-over the sources from the development repo to GP before a release with a simple commit message like "updates from upstream" (something similar to what happens when Scintilla gets updated in Geany).

The question is what to do when someone makes a pull request to the plugin in GP - one option is to merge it in GP and apply it also upstream, the other is to reject the patch in GP and ask for submitting it upstream.

I don't mind formatting patches for changes to upstream so they can be applied to the fork in Geany-Plugins, but it's going to get harder and harder as the fork has diverged significantly from my repo (ex. the proxy plugin stuff, the geany_functions commit, etc).

That's real pity it became a real fork - any chance to get the implementations merged so there's just one geanypy? Which one contains what - the GP one contains the proxy plugin stuff and yours not or the other way round?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The question is what to do when someone makes a pull request to the plugin in GP - one option is to merge it in GP and apply it also upstream, the other is to reject the patch in GP and ask for submitting it upstream.

Unless the GP maintainer intends to have a proper fork, IMO the proper way is to only accept Git-formatted patches from upstream, keeping the authorship and commit messages at least, if possible. Shouldn't allow changes downstream which are not first applied upstream. Something like #440 would enforce this and makes it easier to keep downstream tracking (whatever stable) upstream they want.

That's real pity it became a real fork - any chance to get the implementations merged so there's just one geanypy?

I don't think it would be really hard to bring them inline, but it would be better to do it after something like #440 so it can't happen again, IMO.

Which one contains what - the GP one contains the proxy plugin stuff and yours not or the other way round?

Yeah, the main repo doesn't have the proxy plugins stuff merged, mostly because a) it got rebased after I started reviewing/testing b) I wanted to retain compatibility so everybody's plugins didn't break and c) after I gave in and gave @kugel- the OK to merge it, I think he lost interest since it was merged in the fork already.

Copy link
Member Author

@elextr elextr Jun 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something like #440 would enforce this and makes it easier to keep downstream tracking (whatever stable) upstream they want.

+1

[Edit: it was actually my understanding when the proxy stuff was committed that the compatibility problems had been fixed, but it since appears not. This has (correctly IMHO) delayed committing it upstream]

W: http://plugins.geany.org/geanypy.html
S: Maintained
S: Orphaned, diverged from upstream
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The "diverged from upstream" part can be easily fixed by a simple "git revert" of the patch I merged or by applying the patch upstream - but this requires some kind of actual maintenance of the plugin which is something that should happen if the plugin should stay in GP (my opinion).


geanysendmail
P: Frank Lanitz <frank@frank.uvena.de>
Expand Down