On Fri, 30 Jun 2017 21:47:25 +0100 Sean Whitton <[email protected]> wrote: > On Fri, Jun 16, 2017 at 01:07:04PM +0100, Sean Whitton wrote: > > Here's a patch, though I think we need to wait for #864881. > > Here is an updated patch taking into account the gbp maintainer's resolution > of #864881.
Cool, thanks! Another section that could be improved in the dgit-maint-merge man page is "NEW UPSTREAM RELEASES" "When upstream releases only tarballs". After running "gbp import-orig" the master branch will contain the new upstream version but changes from debian/patches are not applied. The man page could expand on best practices on how to carry over changes from the last upstream version to the new upstream version. And secondly, the section for "When upstream releases only tarballs" should at least contain as much information as the section "When upstream tags releases in git". So the former could also have some references to how to inspect upstream changes and how to run dch. Thanks! cheers, josch
signature.asc
Description: signature
