issues and merge requests

[Peter Hutterer]

On Tue, Feb 06, 2024 at 11:41:06AM +0100, Enrico Weigelt, metux IT consult wrote:
> On 05.02.24 22:56, Peter Hutterer wrote:
> 
> > Best approach is to add a line "Fixes #123" into the commit message
> > and/or the merge request and gitlab will automatically link to to issue
> > 123 in the same repo and close it when merged.
> 
> I believe gitlab reacts on "Closes:", like this:
> 
> Closes: xorg/xserver#1631

It supports that too, but afaik the use of Fixes is more common in the
xorg repo. In (some?) gnome OTOH repos Closes refers to an issue anf
Fixes usually to a commit.

> By the way: how to do we handle fixes that might go to several branches ?

merge it into master, then `git cherry-pick -x` to the branch, file a
merge request for that particular branch. The gitlab closed merge
request page will have examples of those, usually prefixed with the
branch they're supposed to be merged in to make them easier to identify.

Cheers,
  Peter

> 
> For example, we might have have things that should go to 21.x branch
> as well as master, as well as xwayland branch.
> 
> 
> --mtx
> 
> --
> ---
> Hinweis: unverschlüsselte E-Mails können leicht abgehört und manipuliert
> werden ! Für eine vertrauliche Kommunikation senden Sie bitte ihren
> GPG/PGP-Schlüssel zu.
> ---
> Enrico Weigelt, metux IT consult
> Free software and Linux embedded engineering
> info at metux.net -- +49-151-27565287