control: tag -1 -moreinfo Hello,
On Sat 05 Jan 2019 at 07:14pm GMT, Ian Jackson wrote: > Stepping back a bit: with a rebasing workflow such as you describe, > dgit's sanity check strategy for overwriting-pseudomerges (which are > basically like force pushes) cannot work. > > I am not sure if there is a better sanity check strategy that could > work. It seems difficult. If the user is in this situation their > branch is not ff from the suite branch *and* their changelog doesn't > mention the previous upload. > > It is difficult to see how to distinguish this from the case where > someone (for example) simply prepares a fresh backport of a package > without regard to any previous work. And of course doing such a fresh > backport without looking at the previous work risks introducing a > regression, if a naive backport would introduce a bug which is in fact > fixed, right now, by extra change(s) in the current backport. > > So I think the right answer is perhaps indeed to require that the user > says > --overwrite=2.13.0-1.1~bpo8+1 > or whatever, so forcing them to at least prove that they knew there > was a previous backport. > > > Does that make some kind of sense ? How can we better guide the user > who finds themselves in this situation ? Suggesting that the user use --overwrite=2.13.0-1.1~bpo8+1, or `git merge -s ours dgit/dgit/stretch-backports`, is indeed what we should do. I think that official backports is the only case where this is likely to come up often. So I suggest that we start a dgit-maint-bpo(7) with tips and techniques for maintaining official backports (also see #898494). In that page we can say that if you are using what in this bug I've called a rebase workflow, you will need to use --overwrite=X.Y.Z for each upload. (Calling it dgit-maint-bpo(7) rather than dgit-maint-backport(s)(7) is meant to make explicit reference to backports.debian.org.) I also think that dgit could emit a recommendation to look at that manpage in the kind of case that prompted me to file this bug. It can just look for ~bpoNN in the version number that is missing from d/changelog, and output a hint. -- Sean Whitton
signature.asc
Description: PGP signature
