Control: severity -1 normal
Control: retitle -1 dgit-maint-merge(7): clarify patch series non-goal

Daniel Shahaf writes ("Bug#851897: dgit: please have generated source packages 
contain standard patch series"):
> Some source packages generated by dgit have a single debian patch, with
> instructions in debian/source/patch-header to use dgit to obtain the
> patch series.  That's advised by dgit-maint-merge(7).

Thanks for the report.

After discussing this on IRC, you and I have come to the conclusion
that your main problem is that the maintainer of the package in
question has adopted a workflow which does not maintain a cleanly
separated patch series.

(In our IRC conversation I mentioned that there are other possible
dgit workflows, such as dgit-maint-gbp(7) and the putative
git-debrebase one.)

Looking at dgit-maint-merge(7), I think it doesn't make this
particular tradeoff clear enough.  I think perhaps it should be
enhanced with an additional bullet point, something like this:

  o  It is not necessary to maintain the divergence from upstream
     (if any) as a patch series.  That is: it is not necessary to
     maintain the delta as a stack of individual commits or patches,
     to be applied in turn to the current upstream.

Sean, Daniel, what do you think ?

FTR: Sean Whitton is the author of that manpage.

Ian.

-- 
Ian Jackson <[email protected]>   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.

Reply via email to