[BUG] develop-6.x.x is out of sync with 6.3.0 latest release

[duncdrum]

According to the contribution notes the develop-6.x.x is the main branch for ongoing 6.x development.

6.3.0 was released from the 6.3.0-branch but we haven't merged back into develop-6.x.x If we want to have a continuous history it should be merge.

[adamretter]

It should not be merged back. As I previously explained to you here and here, if you do that, you will loose context and history and drop some commits. It is a very bad idea to do that!

The part of the Contributing to eXist-db document that you sited was written by me and my team. It does not mention release branches (e.g. 6.3.0-branch) at all intentionally. That document is designed for Contributors and not Release Managers, its guidance does not cover this situation. The use of release branches are an exceptional circumstance (as evidenced by the fact that there have only ever been 5 of them in 20 years).

[line-o]

As I see it, a release branch would have been necessary for a v6.2.1 release since new features were introduced to develop-6.x.x. All new features were released with v6.3.0 and the release could have been cut from that branch and we would not have this conversation right now.

[adamretter]

All new features were released with v6.3.0

@line-o No, that is not the case, and at least @dizzzz is aware of that as we discussed it at the time. Please read the Git history.

[line-o]

I understood that he was made aware of the fact after the release. So there was no discussion with him nor any other interested party and no peer review.

[adamretter]

@line-o I am trying to help you here to do the release that you want to do without things getting broken. Please try and be constructive and considerate in your tone.

[reinhapa]

@adamretter I try to follow the current discussion and getting a bit confused.

What exactly is the relation between the develop-6.x.x develop branch and the 6.3.0-branch exactly? Do you have a description of the exact release procedure you followed in doing the last release in order for me to understand how this came to be?