Hello Samuel, On 04/03/2025 04:06, Samuel Henrique wrote: > I've pushed a commit that manually reverts the last 2 upstream commits, let me > know if that is enough.
Thanks for that. I pushed my work, AFAICT the package update is trivial. I propose the following workflow: 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 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... Tell me if that works for you. Thanks, -- Arnaud Rebillout / OffSec / Kali Linux Developer
