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

Rebase glasnostlinux/kiss repo instead of manual "merges" #14

Open
JamiKettunen opened this issue May 10, 2022 · 0 comments
Open

Rebase glasnostlinux/kiss repo instead of manual "merges" #14

JamiKettunen opened this issue May 10, 2022 · 0 comments

Comments

@JamiKettunen
Copy link

JamiKettunen commented May 10, 2022

As it stands glasnostlinux/kiss is supposedly in-line with upstream's latest 5.5.28 tag but the visible state is 26 commits ahead, 491 commits behind kisslinux/kiss:master and the "merge" commits (example here) aren't done using git merge either and seem to be handcrafted which makes it impossible to tell what changes came from where when looking at git blame for example.

As I see it this isn't sustainable especially if the plan is to carry as little on top of the official KISS package manager repo as possible, so for now I've gone ahead and made a comparison repo based on 5.5.28 tag with all the Glasnost repo changes added on top as a single commit. This obviously should be split into multiple logical parts (commits) implementing different required changes for Glasnost. Perhaps you'll even find some odd stuff on that diff such as the outdated dead link to the official KISS Linux website that can be fixed hopefully sooner than later.

When there is a clean tree eventually based on the 5.5.28 tag the old tree can be archived on a legacy branch or similar if needed so development can continue with a clean repo that can be rebased as needed on top of new KISS package manager changes.

In the end I think even normal merges (while more ugly, simpler for multiple people to work on the repo) are fine since they'll at least reflect the state properly.

I've created this issue here since all other repos appear to have issues disabled.

@JamiKettunen JamiKettunen changed the title Rebase glasnostlinux/linux repo instead of manual "merges" Rebase glasnostlinux/kiss repo instead of manual "merges" May 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant