[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: My preference to use Merge Requests and examples of them in practice for both package updates and new packages



Hi Otto,

Thanks for your work.

On 01/08/25 03:25, Otto Kekäläinen wrote:
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.

Also some folks want to store the exact same git history as upstream in the upstream branch. MRs will add
a salsa/gitlab based commit when merged.

Do you have any good ways to handle these? For upstream updates I usually just ask people to push directly
due to this.

Even better, to make repeating this super easy, I filed "mock MRs"
with every single step and command documented:
* https://salsa.debian.org/go-team/packages/golang-github-holiman-uint256/-/merge_requests/1
* https://salsa.debian.org/go-team/packages/golang-github-gonvenience-idem/-/merge_requests/1
* https://salsa.debian.org/go-team/packages/dyff/-/merge_requests/1

How do you add a debian/sid branch which is equivalent to upstream tag? Do you checkout to a branch
and manually push? And then make another MR with just the debian/ directoy?

If you follow this pattern and file a MR in the Go team, feel free to
add me as the reviewer!

I can also review non-MR work, but I am just saying that if it is an
MR, it is much easier for me personally.

I am checking my dashboard at
https://salsa.debian.org/dashboard/merge_requests?scope=all&state=merged&reviewer_username=otto
on daily basis and promise to review and re-review all MRs quickly.

Thanks for spending your time in reviews!

-n


Reply to: