Dima Kogan writes ("Bug#1124338: dgit: dgit is confused by merged branch with
debian/"):
> OK... after I combine the upstream tree and the debianization (via a
> merge of rebase of whatever) I will have a patches-applied repo, so
> --quilt=gbp is 100% not the right thing. Right? Is --quilt=linear also
> not the right thing?
dgit-maint-merge says to use the 1.0 native source format. So you
need to change the source format. Then you don't need to specify a
quilt mode and dgit won't need to do anything with patches.
The other patches-applied format we recommend is
dgit-maint-debrebase. Please refer to the manpage intros for guidance
on which to choose.
Ian.
