Simon Josefsson writes ("Bug#1127666: how to recover from intermittent SSH
push.dgit.d.o issue?"):
> My reading of the man page is that --deliberately-not-fast-forward is
> the relevant parameter for this situation, but it fails (I'm still on
> 14.7~bpo13+1) when I try it now (fortunately for this bug report the
> package was REJECTED again so I got to retry this).
> The package was REJECTED for copyright reasons and the man page says:
Thanks for your careful approach.
We may need to update the documentation.
Did you in fact rewind history to no longer include the REJECT-worthy
material ?
> --deliberately-not-fast-forward
>
> When pushing to Debian, use this only when you are
> making a re‐ newed upload of an entirely new source
> package whose previous version was not accepted for
> release from NEW because of problems with copyright or
> redistributibility; or, exceptionally, for the very
> first upload with dgit.
This really ought to say that this is only applicable if you actually
rewound the history! But I think you probably didn't ?
> It warns me to not use the following for this situation:
>
> --deliberately-include-questionable-history
>
> Declare that you are deliberately including, in the
> git history of your current push, history which
> contains a previously-submit‐ ted version of this
> package which was not approved (or has not yet been
> approved) by the ftpmasters. When pushing to Debian,
> only use this option after verifying that: none of the
> rejected- from-NEW (or never-accepted) versions in the
> git history of your current push, were rejected by
> ftpmaster for copyright or redis‐ tributability
> reasons.
This message is overly cautious.
I see that this package is on Salsa at
https://salsa.debian.org/go-team/packages/golang-filippo-nistec
I assume that the REJECTed material is included in the history you're
publishing there ? In which case it is fine to have it on dgit-repos
too, just not your Debianised package.
> I will hold off upload until I can retry with 14.8 to see if it
> behaves different.
dgit 14.8 won't do anything meaningfully differnet, and neither will
the server software when we update it - the fixes are just to
messages, not to behaviour.
So you may as well go ahead, but presumably we should finish this
conversation (and decide how to fix the docs!) first.
Regards,
Ian.
