Control: tags -1 moreinfo
Control: retitle -1 quilt linearisation failure when maybe trying to use
dgit-maint-merge(7)
Dima Kogan writes ("Bug#1124338: dgit: dgit is confused by merged branch with
debian/"):
> Hi. Thanks for replying. I did read the docs, and the "maint-merge"
> workflow is what I'm pretty sure I want.
I went to look at this bug again, and reread dgit-maint-merge(7).
It says to do this (and also to create a debian/source/options):
git config dgit.default.quilt-mode single
https://manpages.debian.org/trixie/dgit/dgit-maint-merge.7.en.html#SOURCE_PACKAGE_AND_GIT_CONFIGURATION
> dima@shorty:/tmp/mrcal$ dgit --clean=git --quilt=linear quilt-fixup
This is explicitly requesting --quilt=linear, which won't work with a
merging git branch. That's why dgit-maint-merge(7) says to use
--quilt-single (via a git config option).
So I think this was probably the root cause of the problem.
Since we last spoke about this I wrote a blog post:
Adopting tag2upload and modernising your Debian packaging
https://diziet.dreamwidth.org/20851.html
Although (as Ben correctly points out) dgit-maint-merge can be used
with "3.0 (quilt)", in that post I recommend using 1.0 native.
You're right that this is all quite confusing. Especially, it can get
very confusing if you try to do the transition and only get halfway
through it.
Please let us know if we can help any further.
Regards,
Ian.
--
Ian Jackson <[email protected]> These opinions are my own.
Pronouns: they/he. If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.
