[Gimp-docs] diff/patch problems

[Ulf-D. Ehlert]

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"?

> 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...

> 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".

Ulf