[Gimp-docs] diff/patch problems

[Kolbjørn Stuestøl]

Hi Ulf

Thank you for answering.

Sorry for being so late. Sometimes there is a life outside GIMP to J

(or as Axel said it: so much life so little time)

Ulf-D. Ehlert wrote:
> Kolbjørn Stuestøl (Sonntag, 7. Oktober 2007, 16:44):
>> Running 'svn diff' on the file
>> 'src/filters/light_effects/drop-shadow.xml' results in one single
>> hunk for the whole file.
>
> This file is new. It looks like it is missing in your local working
> copy. Did you run "svn update"?
Yes, as I always do.


>
>> The whole content in the file is removed
>
> By the 'svn diff' command??
>
>> and then added together with my translation.
>
> ??
>
>> Patching results in the
>> error message 'Hunk #1 FAILED at 1.'
>>
>> Patching the file 'filters/web/imagemap.xml'. Here I get '48 out of
>> 48 hunks FAILED' even if I only change one single word in the file.
>
> Which patch are you trying to apply?
>
>> I  have tried to reload/updating the files, but same result.
>>
>> Some solutions?
>
> It seems that I don't even understand what you are trying to do...
>
Well, another try, step by step:

This time I made two copies of my updated gimp-help-2 version: "gimp-1" and 
"gimp-2" leaving gimp-help-2 unchanged in case I should need the original later.

Changed directory to 'gimp-2/trunk' and ran './autogen.sh -without-gimp'. For 
one reason or other I this time had to delete the two files 'missing' and 
'install-sh' to avoid autogen.sh to stop with an error message telling that 
these two files exist. Added my translations and thereafter run 'svn diff 
 >test.patch' and copied the resulting test.patch to the gimp-1/trunk, changed to 
the gimp-1/trunk directory and ran 'patch -dry-run -p0 <test.patch  >test.txt'. 
Result: 'Hunk #1 FAILED at 1.' for all the files in the filters/decor folder and 
the drop-shadow.xml and perspective-shadow.xml in the src/filters/light_effects/ 
folder.



Looking at for example the file drop-shadow.xml in the test.patch the only 
"normal" lines are the two first:

--- src/filters/light_effects/drop-shadow.xml     (revision 2107)

+++ src/filters/light_effects/drop-shadow.xml   (working copy)

The next lines are marked for deletion with a minus sign (-):

@@ -1,575 +1,581 @@

-<?xml version="1.0" encoding="UTF-8"?>

-

.

-  </sect3>

-</sect2>



Thereafter all lines, including my adding's, are signed with a plus sign 
indicating this lines should be added:

+<?xml version="1.0" encoding="UTF-8"?>

+

+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"

+                "http://www.docbook.org/xml/4.3/docbookx.dtd">



Instead of lots of numbered hunks ("@@ -1,866 +1,875 @@" etc.), the file only 
has one hunk which failed the patching: 'Hunk #1 FAILED at 1.'


>> Using commands "svn diff >test.patch"
>
> This command will display the difference of the repository version and
> your current local version. Output is redirected to the
> file "test.patch".
>
>> and "patch -p0 <test.patch  >test.txt"
>
> Then you try to apply this patch (in the same directory?). This can't
> work.
>
>> in Cygwin on Windows XP.
>
> Hmm, trailing "^M"s in your modified files?! Try "cat -v file-name".
No help, just added lots of "^M"s to the file. Perhaps I used it in the wrong 
way.



Kolbjoern


>
> Ulf
> _______________________________________________
> Gimp-docs mailing list
> Gimp-docs at lists.XCF.Berkeley.EDU
> https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs

IKT i praksis.

IT-pedagog Kolbjørn Stuestøl
Stuestøl
N4580 Lyngdal
webside: http://home.online.no/~kol-stue/