Re: My preference to use Merge Requests and examples of them in practice for both package updates and new packages
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?
For a new upstream version import there should be just one single MR,
and that is for the changes on the debian branch. See
https://salsa.debian.org/go-team/packages/fzf/-/merge_requests/6 as an
example.
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.
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
This is how I started the review on my laptop while in a checkout of
the repo and having the target branch open:
± git pull https://salsa.debian.org/momoto/golang-github-holiman-uint256.git
import/1.3.2-1
remote: Enumerating objects: 16, done.
remote: Counting objects: 100% (16/16), done.
remote: Compressing objects: 100% (12/12), done.
remote: Total 15 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0)
Unpacking objects: 100% (15/15), 3.96 KiB | 312.00 KiB/s, done.
>From https://salsa.debian.org/momoto/golang-github-holiman-uint256
* branch import/1.3.2-1 -> FETCH_HEAD
Updating 27fb760..c8bf305
Fast-forward
debian/.gitignore | 8 ++++++++
debian/changelog | 5 +++++
debian/control | 27 +++++++++++++++++++++++++++
debian/copyright | 43 +++++++++++++++++++++++++++++++++++++++++++
debian/gbp.conf | 35 +++++++++++++++++++++++++++++++++++
debian/gitlab-ci.yml | 16 ++++++++++++++++
debian/rules | 4 ++++
debian/source/format | 1 +
debian/upstream/metadata | 5 +++++
debian/watch | 4 ++++
10 files changed, 148 insertions(+)
create mode 100644 debian/.gitignore
create mode 100644 debian/changelog
create mode 100644 debian/control
create mode 100644 debian/copyright
create mode 100644 debian/gbp.conf
create mode 100644 debian/gitlab-ci.yml
create mode 100755 debian/rules
create mode 100644 debian/source/format
create mode 100644 debian/upstream/metadata
create mode 100644 debian/watch
Current branch debian/latest is up to date.
# read and review commit messages and contents
± gitk --all
# build locally
± debcraft build
# read and review what changed in output
± meld <old build artifacts> <new build artifacts>
Pulling from somebody's fork of course works only if there is a fork.
If somebody pushed pristine-tar and upstream/latest directly on the Go
team packaging repository there isn't even anything to pull or review
anymore (at most force push older version if import was totally
wrong).
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.
Reply to: