When submitting a bugfix patch *initially*

[Corinna Vinschen]

On Nov  7 22:29, Mark Geisert wrote:
> ..to the main branch, which release version file gets the bugfix
> description?  Assuming current branches...
> version/3.6.0 because the patch is initially going to master, or
> version/3.5.5 on the main branch because bugfixes get backported?
> 
> If version/3.6.0 initially, then when the bugfix gets backported does the
> bugfix description move from version/3.6.0 to version/3.5.5 or does it exist
> in both version files?

It's pretty simple:

- If you create a bugfix which is supposed to be backported to the 3.5
  branch anyway, the release text should go to 3.5.x, with x being the
  next version.

- If the patch is not supposed to be backported to the 3.5 branch -->
  release/3.6.0.  This includes new functionality, bugfixes to code
  only in the main branch, everything else.


Corinna