Hello Arnaud, On Tue, 4 Mar 2025 at 04:42, Arnaud Rebillout <arna...@kali.org> wrote: > 1. review/merge https://salsa.debian.org/debian/rsync/-/merge_requests/17 > 2. run `gbp import-orig --uscan` on your side > 3. review/merge https://salsa.debian.org/debian/rsync/-/merge_requests/18 > 4. run `gbp dch --commit --release` on your side, don't forget to mention > (Closes: #1093081) for the "new upstream version" commit > > For 3. the MR will need a rebase. Either I rebase after you run 2. and push, > or you cherry-pick the commits, at your preference.
I'm afraid that this ended up being more work for you than I intended, sorry about that, > I can also do a MR with everything done at once, but a MR is only one branch, > I'm afraid it just makes everything more complicated, and I don't know how > you could review/trust the import-orig step anyway... My intention was that you would do everything in a single MR (for the Debian branch), then for merging I could either pull the other branches from your fork (I manually compare the imported orig tarball with uptream's) or tell you to push directly and upload. This is how we do for contributors from the Debian Brasil mentorship program. That being said, the goal of using the "debian" namespace on salsa is to make it easier for others to contribute, the only reason I asked to review first was because I thought there would be big d/copyright changes needed. Given this is not the case, please feel free to push to the repo at debian/ and do a "Team upload". Cheers, -- Samuel Henrique <samueloph>
