Sean Whitton writes ("Re: Bug#857490: dgit: shouldn't fail when previous
backport not mentioned in changelog"):
> 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.)
SGTM.
> 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.
Are you volunteering to write the (7) manpage ? :-)
Thanks,
Ian.
--
Ian Jackson <ijack...@chiark.greenend.org.uk> These opinions are my own.
If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.
