On Mon, Jan 03, 2011 at 08:52:26PM +0100, Raphael Hertzog wrote:
> On Mon, 03 Jan 2011, Bastian Blank wrote:
> > dpkg-source rejects valid patch files:
> > | dpkg-source: error: diff
> > `xen/debian/patches/upstream-21334:993458f6c5a0+21405:ae381a864b4f' patches
> > file xen/xen/arch/x86/mm/hap/p2m-ept.c twice
> >
> > Unified diff files are applied from the start to the end, file by file.
> > There is no notion of duplicate files in it.
> While such files are valid patch files, "diff" will never generate such a
> patch. So it's a sign either of a mistake or of a somewhat manually
> crafted diff.. I think it's best to be on the safe side and error out.
It is a crafted file. It consists of two appended diffs.
> This restriction exists since forever in dpkg-source, it was applied
> in .diff.gz files and it's thus now also applied on quilt patches.
diff.gz is never hand-generated, the contents of debian/patches are. If
they may not, you have to document it.
> > quilt and patch applies this patch without problems:
> > | Applying patch upstream-21334:993458f6c5a0+21405:ae381a864b4f
> > | patching file xen/arch/x86/mm/hap/p2m-ept.c
> > | patching file xen/arch/x86/mm/hap/p2m-ept.c
> And quilt refresh will get rid of that.
And it gets rid of many other things, the comments for example.
> I don't know whether I'm going to accept this request. I'm rather enclined
> to tag it wontfix. But I welcome supplementary feedback.
Okay, another nail in the cofin of the quilt source format. It looks
like a mistake to even thought about using it.
Bastian
--
Oblivion together does not frighten me, beloved.
-- Thalassa (in Anne Mulhall's body), "Return to Tomorrow",
stardate 4770.3.
--
To UNSUBSCRIBE, email to debian-dpkg-bugs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
