Re: My preference to use Merge Requests and examples of them in practice for both package updates and new packages
Hi!
> > Where did you find MRs for updates on 2 branches?
>
> See this for example:
>
> https://salsa.debian.org/go-team/packages/golang-github-buger-goterm/-/merge_requests/3
> https://salsa.debian.org/go-team/packages/golang-github-buger-goterm/-/merge_requests/4
>
> And another one:
>
> https://salsa.debian.org/go-team/packages/golang-github-docker-go-units/-/merge_requests/2
> https://salsa.debian.org/go-team/packages/golang-github-docker-go-units/-/merge_requests/3
Both of these are 1 year old and never got any review. I pinged now
both asking if the submitter wants a review. If they do I will teach
them how to do Debian packaging properly. There are more for them to
learn than just not to submit parallel MRs.
> > As Andrea wrote, when reviewing and merging you can use command-line
> > git commands to directly pull stuff from the submitter. For example I
> > am right now reviewing
> > https://salsa.debian.org/go-team/packages/golang-github-holiman-uint256/-/merge_requests/2
>
> I am aware how to do this, and have done it in the past. However, if I
> manually pull the changes from the fork and push to the main repo, the
> MR did not get marked as merged automagically -- and I had to close the MR
> with a note that the changes have been merged.
Both GitHub and GitLab have always worked like this: if you push the
commits from a MR/PR on the target branch the MR/PR will be marked as
"closed" automatically. If it didn't work for you, you probably pushed
something else than the exact same commit. I am happy to check
examples if you have any old ones to show.
> > Feel free Nilesh to assign me as a reviewer in your next package
> > update and I can paste there the exact commands I use to review and
> > merge.
>
> I'd still be interested to know as to how you do it, and if it's any
> different from how I'd go about this. I pushed an update to a package in
> salsa before I saw this mail. I'll nudge you for the next one!
Sure, let's do that!
Trixie is almost released and unstable soon open again, and Salsa CI
will soon gain capability to automatically test building reverse deps
(https://salsa.debian.org/salsa-ci-team/pipeline/-/merge_requests/613)
so I am sure there will be many packages you can and want to update :)
Reply to: