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

feature-branch: deprecation-notice #10

Open
AiyionPrime opened this issue Mar 9, 2023 · 6 comments
Open

feature-branch: deprecation-notice #10

AiyionPrime opened this issue Mar 9, 2023 · 6 comments
Labels
question Further information is requested

Comments

@AiyionPrime
Copy link

AiyionPrime commented Mar 9, 2023

I'm not sure if upstream would be interested in the deprecation notice; I assume it has already been tried to contribute it back but was declined?

edit: consider the next portion nevermind

If so, any chance we could open a feature-branch in this repo, to collaboratively work on the deprecation list without having to filter the relevant commits to cherry-pick each time we rebuild our map

I think the feature is a really worthwhile addition but maintaining it locally will becoming an utter pain. I heard @grische plans on updating their copy of the list in the next days as well.
Maybe we can focus our efforts here?

edit

I think everybody here knows feature branches; but for others:
One would open a branch which contains every commit that touches the deprecation-list and only that.
The goal would to have this branch to be able to merge into your local repo without much trouble.

@AiyionPrime
Copy link
Author

AiyionPrime commented Mar 9, 2023

fml. Not sure how I overlooked https://github.com/freifunk-ffm/meshviewer/tree/feature_deprecation

@margau, @MyIgel: Is that branch currently maintained? If so, I should reopen the PR against that one, right?

@margau
Copy link

margau commented Mar 9, 2023

From my Side, nothing in that fork is actively maintained, sorry.

@MyIgel
Copy link
Member

MyIgel commented Mar 9, 2023

The ffffm fork is actually "actively" maintained but not the branch itself as it was integrated in our main branch.
We could create a PR (and feel free to do that if you want) but as any contributions by anyone where very actively blocked by the upstream maintainer we gave up contributing there.

@MyIgel MyIgel added the question Further information is requested label Mar 9, 2023
@AiyionPrime
Copy link
Author

I'll prepare the branch then.

@AiyionPrime
Copy link
Author

AiyionPrime commented Mar 11, 2023

@MyIgel All right. I think I'm done.

https://github.com/freifunkh/meshviewer/tree/feature-deprecation-warning

This branch contains the commits @margau had in his original PR, plus some linting fixes so it can build using gulp again, as well as a change as upstream does not have the same config file as you do.

I'd suggest we put that branch in your meshviewer repo, open a PR against ffrgb and ask xaver to just let it stay there.
That way, we could easily track whether it still applies to upstream/master.

Whenever we then want to change the list of deprecated devices or the feature in general we can open a PR against the featurebranch, so that the PRs are taking place here and not in ffrgb's repo, so xaver doesn't have to bother with us at all.

@MyIgel
Copy link
Member

MyIgel commented Jun 12, 2023

Hmm, that sounds interesting :D

@weeman1337 weeman1337 mentioned this issue Oct 5, 2023
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
question Further information is requested
Projects
None yet
Development

No branches or pull requests

3 participants