Csound Csound-dev Csound-tekno Search About

[Csnd-dev] Manual

Date2024-12-15 10:02
FromFrancois PINOT
Subject[Csnd-dev] Manual
I noticed that PRs were still addressed to  the master branch of the manual instead of the 7.0 branch. This was confusing and needed extra work on branch 7.0.
I merged branch 7.0 to master, deleted branch 7.0 and tagged  branch master with the new tag 7.00.0.
Documenters should work now on branch master.

Regards

François


Date2024-12-15 11:05
Fromtjingboem
SubjectRe: [Csnd-dev] Manual
Yes that was a pain in the arm, and it happened more than once that my commits were 'accidentally' fighting to get a place in master.
Thanks for the clean up.
Are the other branches build-python-3, docbook5 and gh-pages still active and needed?

On Sun, Dec 15, 2024 at 11:02 AM Francois PINOT <fggpinot@gmail.com> wrote:
I noticed that PRs were still addressed to  the master branch of the manual instead of the 7.0 branch. This was confusing and needed extra work on branch 7.0.
I merged branch 7.0 to master, deleted branch 7.0 and tagged  branch master with the new tag 7.00.0.
Documenters should work now on branch master.

Regards

François


Date2024-12-15 11:31
FromFrancois PINOT
SubjectRe: [Csnd-dev] Manual
The other branches are still active but I don't know if someone uses them.

Le dim. 15 déc. 2024 à 12:06, tjingboem <magknevel@gmail.com> a écrit :
Yes that was a pain in the arm, and it happened more than once that my commits were 'accidentally' fighting to get a place in master.
Thanks for the clean up.
Are the other branches build-python-3, docbook5 and gh-pages still active and needed?

On Sun, Dec 15, 2024 at 11:02 AM Francois PINOT <fggpinot@gmail.com> wrote:
I noticed that PRs were still addressed to  the master branch of the manual instead of the 7.0 branch. This was confusing and needed extra work on branch 7.0.
I merged branch 7.0 to master, deleted branch 7.0 and tagged  branch master with the new tag 7.00.0.
Documenters should work now on branch master.

Regards

François


Date2024-12-15 12:07
Fromvlz
SubjectRe: [Csnd-dev] Manual
Why don't you lock master as 6.18.1, make two branches, csound6 and develop, for 7.0.0, to mirror the way things are structured in csound/csound?

No more merging to master until a release. Make develop the default branch.

best
Prof. Victor Lazzarini
Maynooth University
Ireland

On 15 Dec 2024, at 11:31, Francois PINOT <fggpinot@gmail.com> wrote:


The other branches are still active but I don't know if someone uses them.

Le dim. 15 déc. 2024 à 12:06, tjingboem <magknevel@gmail.com> a écrit :
Yes that was a pain in the arm, and it happened more than once that my commits were 'accidentally' fighting to get a place in master.
Thanks for the clean up.
Are the other branches build-python-3, docbook5 and gh-pages still active and needed?

On Sun, Dec 15, 2024 at 11:02 AM Francois PINOT <fggpinot@gmail.com> wrote:
I noticed that PRs were still addressed to  the master branch of the manual instead of the 7.0 branch. This was confusing and needed extra work on branch 7.0.
I merged branch 7.0 to master, deleted branch 7.0 and tagged  branch master with the new tag 7.00.0.
Documenters should work now on branch master.

Regards

François


Date2024-12-15 15:30
FromFrancois PINOT
SubjectRe: [Csnd-dev] Manual

Done. Now the master branch is locked at 6.18.0 (there was no 6.18.1 tag). There is a new branch called csound6 (from tag 6.18.0) and a new branch called develop (from tag 7.00.0). There are actually no PR rules for branches csound6 and develop. I can add some rules if needed.

François

Le dim. 15 déc. 2024 à 13:07, vlz <viclazzarini@gmail.com> a écrit :
Why don't you lock master as 6.18.1, make two branches, csound6 and develop, for 7.0.0, to mirror the way things are structured in csound/csound?

No more merging to master until a release. Make develop the default branch.

best
Prof. Victor Lazzarini
Maynooth University
Ireland

On 15 Dec 2024, at 11:31, Francois PINOT <fggpinot@gmail.com> wrote:


The other branches are still active but I don't know if someone uses them.

Le dim. 15 déc. 2024 à 12:06, tjingboem <magknevel@gmail.com> a écrit :
Yes that was a pain in the arm, and it happened more than once that my commits were 'accidentally' fighting to get a place in master.
Thanks for the clean up.
Are the other branches build-python-3, docbook5 and gh-pages still active and needed?

On Sun, Dec 15, 2024 at 11:02 AM Francois PINOT <fggpinot@gmail.com> wrote:
I noticed that PRs were still addressed to  the master branch of the manual instead of the 7.0 branch. This was confusing and needed extra work on branch 7.0.
I merged branch 7.0 to master, deleted branch 7.0 and tagged  branch master with the new tag 7.00.0.
Documenters should work now on branch master.

Regards

François