Hi, > >And it prompts a question: Integrating a new upstream release means > >changing at least two, in the case of pristine-tar being used three > >branches at once, tightly connected to each other, and possibily an > >external file (the orig tarball). Could a contributor do that with an > >MR? > > I've seen the occasional case where a contributor has submitted a set of > multiple MRs to update all the relevant branches, with notes in the MR > description about needing to review them all together. But it's really > very clunky and I don't think it should be recommended.
I have also seen that too, but it seems indeed unnecessary as the contents of the upstream/latest and pristine-tar branches are mechanical and always correct, assuming the packager had the correct starting point and ran the correct command (e.g. gbp import-orig --uscan --verbose). In a review I would not be asking the submitter to change any files on those branches. Only the debian/latest branch is relevant for the review, and the submitter is likely only changing things on that branch based on my review feedback. I have tried to explain this better and in more detail at https://optimizedbyotto.com/post/debian-salsa-merge-request-best-practices/#making-a-merge-request-for-a-new-upstream-version-import In https://salsa.debian.org/games-team/godot/-/merge_requests/19 I reviewed a new contributor's new version MR and in my replies explained to them how I am reviewing and what I am doing for the sake of teaching stuff. Reading those comments may be interesting to people wanting to do similar things.
