install data files below ${prefix}/share/sakia (not ${prefix}/sakia)

install data files below ${prefix}/share/sakia (not ${prefix}/sakia) to comply with File Hierarchy Standard (FHS)

@jonas, thanks for your contributions.

Can you do future merge requests only on dev branch, please?

how do I do that?

I am quite familiar with git, but am a total noob with web-based github/gitlab style merge requests

do you perhaps simply mean that I should not create a wip/* branch but apply my commits directly to the dev branch?

• master branch is the default one of Sakia repository.
• By editing this MR, the targeted branch can be changed to dev.

I have 10+ years experience juggling with git: Yes, I am aware that I can rebase the commit onto a different branch.

Question remains: Is a rebase what you request that I do, @vtexier ?

Thanks to @moul for the hint, you can edit your MR, then you should modify the target branch to dev instead of master.

After that, you surely have to rebase your work on the last dev branch head, as I just modify it today.

Then I will approve and merge your changes.

Do not hesitate to ask if you have questions.

I am still puzzled what above conversation means to my explicit counter-question, but I will try muddle through and time will tell if I did what you wanted...

What I want is this:

• Modify this MR to change the target branch to the dev branch
• GitLab will complain that your branch is not up to date with the target branch
• So you will need to rebase your branch on the dev branch locally

Hope it helps.

@jonas, please, can you edit your MRs to merge onto dev branch ?

Click on the edit button at the top right, then you'll see this :

Edit Merge Request !788

From jonas/sakia:wip/data_path into clients/python/sakia: master

Use the branch selector displaying master and choose dev.

Then update all your branch on your git (with your 10+ years experience I am sure it will not be a problem) and force push your branch again.

Thanks.

PS: Question remains: Is a rebase what you request that I do, response is YES, on dev branch.

But... You HAVE TO change your MRs to merge on the dev branch too.

Hope it helps.

changed target branch from master to dev

added 6 commits

• d79572dd...7acdf0b3 - 5 commits from branch clients/python:dev
• 1e0a6338 - install data files below ${prefix}/share/sakia (not ${prefix}/sakia) to comply...

Compare with previous version

approved this merge request

Sorry Jonas, but Sakia is not maintained anymore. See https://forum.duniter.org/t/fin-du-developpement-de-sakia/7851