Skip to content
This repository was archived by the owner on Feb 16, 2025. It is now read-only.

[CM H1] fixed mount plugin tutorial, as mentioned on tuwel #3723

Closed
wants to merge 395 commits into from

Conversation

philippoppel
Copy link
Contributor

@philippoppel philippoppel commented Mar 23, 2021

Tuwel issue: https://tuwel.tuwien.ac.at/mod/forum/discuss.php?d=243029#p598964

closes #3722 & also added sudo to the first command, which is necessary anyway

Basics

These points need to be fulfilled for every PR:

  • Short descriptions of your changes are in the release notes
    (added as entry in doc/news/_preparation_next_release.md which
    contains _(my name)_)
    Please always add something to the release notes.
  • Details of what you changed are in commit messages
    (first line should have module: short statement syntax)
  • References to issues, e.g. close #X, are in the commit messages.
  • The buildservers are happy. If not, fix in this order:
    • add a line in doc/news/_preparation_next_release.md
    • reformat the code with scripts/dev/reformat-all
    • make all unit tests pass
    • fix all memleaks
  • The PR is rebased with current master.

If you have any troubles fulfilling these criteria, please write
about the trouble as comment in the PR. We will help you.
But we cannot accept PRs that do not fulfill the basics.

Checklist

Check relevant points but please do not remove entries.
For docu fixes, spell checking, and similar none of these points below
need to be checked.

  • I added unit tests for my code
  • I fully described what my PR does in the documentation
    (not in the PR description)
  • I fixed all affected documentation
  • I added code comments, logging, and assertions as appropriate (see Coding Guidelines)
  • I updated all meta data (e.g. README.md of plugins and METADATA.ini)
  • I mentioned every code not directly written by me in THIRD-PARTY-LICENSES

Review

Reviewers will usually check the following:

Labels

If you are already Elektra developer:

  • Add the "work in progress" label if you do not want the PR to be reviewed yet.
  • Add the "ready to merge" label if the basics are fulfilled and you also
    say that everything is ready to be merged.

@mpranj mpranj requested a review from kodebach March 25, 2021 23:15
Copy link
Member

@kodebach kodebach left a comment

Choose a reason for hiding this comment

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

LGTM

@mpranj
Copy link
Member

mpranj commented Mar 25, 2021

Thank you so much for the contribution. Please fix the merge conflict by rebasing from master.

@kodebach please merge if this fully resolves #3722.

@markus2330 markus2330 changed the title fixed mount plugin tutorial, as mentioned on tuwel [CM H1] fixed mount plugin tutorial, as mentioned on tuwel Mar 29, 2021
Michael Tucek and others added 25 commits April 10, 2021 02:26
…w from shell format (shfmt was breaking it) and ran formatter
- added release notes
- set JNA project to build SNAPSHOT version by default
…ect because of unmitigated reformatter issue
Co-authored-by: markus2330 <markus2330@users.noreply.github.com>
Co-authored-by: Mihael Pranjić <mpranj@limun.org>
…mented out the (only) 3 usages of ksRewind in NativePlugin to isolate problem (problem cannot be reproduced locally on my machine)
…rily commented out the (only) 3 usages of ksRewind in NativePlugin to isolate problem (problem cannot be reproduced locally on my machine)"

This reverts commit 6b91332.
… fedora Dockerfiles to prevent error: "Could not find tools.jar. Please check that /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.282.b08-0.fc32.x86_64/jre contains a valid JDK installation."
lawli3t and others added 17 commits April 21, 2021 05:02
Co-authored-by: markus2330 <markus2330@users.noreply.github.com>
…ntation-keyset

Improve documentation of keyset.c with suggestions from API review
…ntation-keymeta

Improve documentation of keymeta.c with suggestions from API review
…ntation-key-2

Improve documentation of key.c with suggestions from API review
…ntation-keyname

Improve documentation of keyname.c with suggestions from API review
Add packaging section in news. Fix my name in docu.
@mpranj
Copy link
Member

mpranj commented Apr 21, 2021

Any news here?

This PR needs a rebase and has open review points.

@philippoppel
Copy link
Contributor Author

Hey, I rebased from master and added a better description, is it fine now?

@mpranj
Copy link
Member

mpranj commented Apr 22, 2021

Thank you! Your PR looks good, but there are still merge conflicts.

Are you sure you rebased from current upstream/master and not an outdated master branch? See the docs for hints how to work with and sync forks.

@mpranj mpranj mentioned this pull request Apr 22, 2021
Copy link
Member

@mpranj mpranj left a comment

Choose a reason for hiding this comment

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

Seems like something went wrong. There is a merge commit which should not be there when rebasing and the PR contains about 390 unrelated commits.

I created #3805, which is a rebased copy of this PR, as an example how it should look.

@philippoppel
Copy link
Contributor Author

thank you for fixing this, sorry for the hassle

when I tried rebasing to upstream/master it did work, but when I tried to push it, my IDE wanted me to merge otherwise my push was rejected. As far as I understood it, I should have reverted the merges I did before and make like a "clean" rebase, correct?

@mpranj mpranj closed this in #3805 Apr 23, 2021
@mpranj
Copy link
Member

mpranj commented Apr 23, 2021

Thank you for the PR and the documentation fixes! It was merged via #3805.

I should have reverted the merges I did before and make like a "clean" rebase, correct?

Afair I simply copied your branch and then rebased from upstream/master again and this already removed the merge commit. Then I fixed some merge errors that were done before (duplicate news entries).
If nothing else works another method is: create a new branch starting from upstream/master and then git cherry-pick all relevant commits. This is usually the last resort though.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mount example broken
10 participants