grammar.xml.diff and international.xml.diff

Matthew East mdke at ubuntu.com
Thu Nov 10 00:07:04 UTC 2005


On Tue, 2005-11-08 at 21:16 +0000, Eamonn Sullivan wrote:
> To test that everything is working, here are a couple of diffs for the
> first document that I read: the styleguide. I'm missing a dependency
> to validate them
> (/usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl) and thus
> build the html, but they both look OK in yelp.

Ok as promised I tried to apply these patches. The grammer patch applied
ok (committed!) but the other one (international.xml.diff) failed, and I
have no idea why, because it looked good to me. The output was:

matt at kalliope:~/ubuntu-docs/trunk/generic/styleguide$ patch -p0
<international.xml.diff 
patching file international.xml
Hunk #1 FAILED at 22.
Hunk #2 FAILED at 41.
Hunk #3 FAILED at 62.
Hunk #4 FAILED at 70.
Hunk #5 FAILED at 89.
5 out of 5 hunks FAILED -- saving rejects to file international.xml.rej

I haven't had any experience with patch I'm afraid so I can't really
help much. Perhaps svn up and retry?

If anyone else knows more, please help!

Matt
-- 
mdke at ubuntu.com
gnupg pub 1024D/0E6B06FF
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <https://lists.ubuntu.com/archives/ubuntu-doc/attachments/20051110/34635856/attachment.pgp>


More information about the ubuntu-doc mailing list