On Wed, Aug 12, 2020 at 09:39:58PM +0100, Ian Jackson wrote:
> Steve Langasek writes ("Bug#968315: dgit fails at serializing quilt patches
> in pam source"):
> ...
> > dgit: error: quilt fixup cannot be linear. Stopped at:
> > dgit: 6f4c661d..e8d14c81: changed
> > .pc/007_modules_pam_unix/.timestamp,.pc/007_modules_pam_unix/modules/pam_unix/Makefile.am,.pc/007_modules_pam_unix/modules/pam_unix/README,.pc/007_modules_pam_unix/modules/pam_unix/obscure.c,.pc/007_modules_pam_unix/modules/pam_unix/pam_unix.8,.pc/007_modules_pam_unix/modules/pam_unix/pam_unix.8.xml,.pc/007_modules_pam_unix/modules/pam_unix/pam_unix_passwd.c,.pc/007_modules_pam_unix/modules/pam_unix/support.h,.pc/applied-patches,debian/patches/007_modules_pam_unix,debian/patches/series
> >
> > dgit: Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?
> > dgit: Maybe orig tarball(s) are not identical to git representation?
> >
> > dgit: error: quilt history linearisation failed. Search `quilt fixup' in
> > dgit(7).
> ..
> > It's not an unapplied tree; I probably would've preferred that, but
> > --quilt=unapplied was useless here and I only started to make any progress
> > at all when I applied the patches to the tree and committed.
>
> I haven't actually looked at your branch or anything but just looking
> at this error message:
>
> I think if you delete the .pc directory from your git tree it will be
> directly in dgitc format.
>
> If you want to keep the .pc directory in your master branch then dgit
> doesn't support that right now. I'm not sure whether there ought to
> be a quilt mode for "maintainer view has .pc directory".I tried that first as well and it didn't work either (actually I think it failed at an earlier point). I'll go back and double-check. -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ [email protected] [email protected]
signature.asc
Description: PGP signature
