On Sat Aug 2, 2025 at 10:30 AM IST, Otto Kekäläinen wrote: > Hi! > >> > This should be fairly easy. For example Vincent submitted a package >> > update as MR in >> > https://salsa.debian.org/go-team/packages/fzf/-/merge_requests/6. >> > Jianfeng submitted a new package in >> > https://salsa.debian.org/go-team/packages/apt-transport-oci/-/merge_requests/4 >> > and Leonardo likewise in >> > https://salsa.debian.org/go-team/packages/golang-github-offchainlabs-go-bitfield/-/merge_requests/2. >> > I am sharing this as examples you can look at. >> >> A bit of an annoyance that I find with MRs for updates is that there are at >> least 2 branches (debian/sid >> and upstream) and there are 2 MRs for the same. > > 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 Pretty sure I can point out several more, I just need to find :-) > There is no point in reviewing the pristine-tar or upstream/latest > branch. Their content is mechanically determined, and the submitter > should not go an manually rewrite anything, so the reviewer can't > really suggest any changes on those branches. Agreed. > 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. I last did it some years ago on salsa. If that actually changed now, that's a positive change, and I'm happy to know that! > 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! Best, Nilesh
