Patch problem

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



I have a problem with xml files written under Windows I received from 
Pierre and Kolbjoern: some of them are correctly patched, others are not.
I got error messages like "Hunk #2 FAILED at 11".
For example with docks.xml in this diff when I tried to patch it:

Index: src/using/docks.xml
===================================================================
--- src/using/docks.xml (révision 1677)
+++ src/using/docks.xml (copie de travail)
@@ -1,8 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
   "http://www.docbook.org/xml/4.3/docbookx.dtd";>

 <!-- section history:
+  2007-01-10  fr modified by Pierre
   2006-07-22 dust: added ko translation
 -->
 <sect1 id="gimp-using-docks" xmlns:xi="http://www.w3.org/2001/XInclude";
@@ -10,7 +11,7 @@
   <sect1info lang="fr;ko;no" role="cvs">
     <revhistory>
       <revision lang="fr">
-        <revnumber>$Revision$</revnumber>
+        <revnumber>$Revision : 1623 $</revnumber>
         <date>2006-02-24</date>
         <authorinitials>j.h</authorinitials>
       </revision>
@@ -100,7 +101,7 @@
         <guisubmenu>Dialogues</guisubmenu>
         <guisubmenu>Créer une nouvelle fenêtre avec onglets</guisubmenu>
       </menuchoice>
-      dans la Boîte à outils:
+      dans la Boîte à outils :
     </para>
...........

I verified that files are in the UNIX UTF-8 format.
What does this "Hunk #2 FAILED at 11" mean?
Why is there two different revision numbers in this diff?
What can I do to solve the problem?

Julien

_______________________________________________
Gimp-docs mailing list
Gimp-docs@xxxxxxxxxxxxxxxxxxxxxx
https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs


[Index of Archives]     [Video For Linux]     [Yosemite News]     [gtk]     [GIMP for Windows]     [KDE]     [Scanners]     [GEGL]     [Gimp's Home]     [Gimp on Windows]     [Steve's Art]     [Webcams]

  Powered by Linux