[MPlayer-DOCS] Re: CZ man sync 1.718

[Jiri Heryan]

Diego Biurrun wrote:

>Jiří Heryán writes:
>  
>
>>Czech manpage: path to version synced with 1.718
>>    
>>
>
>How did you create the patch?  It does not apply.  Please follow
>DOCS/tech/patches.txt.
>
>Diego
>
>  
>
diff -Naur ... - I don´t use diff before, so i follow DOCS exactly.

>silver:/usr/src/mplayer/main/DOCS/man/cz$ patch --dry-run < /tmp/czman717-718.diff
>can't find file to patch at input line 3
>Perhaps you should have used the -p or --strip option?
>The text leading up to this was:
>--------------------------
>|--- cz.717\mplayer.1   2004-09-14 08:33:40.000000000 +0200
>|+++ cz.718\mplayer.1   2004-09-15 13:39:06.000000000 +0200
>--------------------------
>  
>
Oops, my mistake. I use separate dirs for each file version, it's easy 
for transfer on CD.
The lines was to be:

--- mplayer.1   2004-09-14 08:33:40.000000000 +0200
+++ mplayer.1   2004-09-15 13:39:06.000000000 +0200

I make this patch by W32 diff utils port and test it (after change). It 
works (well md5 does not match, because of CRLF vs. LF thing).

Which is better: if I make cummulative patch 717 to current or 718 to 
current? (default: 717 to current)

Jiri

>File to patch:
>silver:/usr/src/mplayer/main/DOCS/man/cz$ patch --dry-run -p0 < /tmp/czman717-718.diff
>can't find file to patch at input line 3
>Perhaps you used the wrong -p or --strip option?
>The text leading up to this was:
>--------------------------
>|--- cz.717\mplayer.1   2004-09-14 08:33:40.000000000 +0200
>|+++ cz.718\mplayer.1   2004-09-15 13:39:06.000000000 +0200
>--------------------------
>File to patch:
>silver:/usr/src/mplayer/main/DOCS/man/cz$ patch --dry-run -p1 < /tmp/czman717-718.diff
>missing header for unified diff at line 3 of patch
>can't find file to patch at input line 3
>Perhaps you used the wrong -p or --strip option?
>The text leading up to this was:
>--------------------------
>|--- cz.717\mplayer.1   2004-09-14 08:33:40.000000000 +0200
>|+++ cz.718\mplayer.1   2004-09-15 13:39:06.000000000 +0200
>--------------------------
>File to patch:
>silver:/usr/src/mplayer/main/DOCS/man/cz$ patch --dry-run -p2 < /tmp/czman717-718.diff
>missing header for unified diff at line 3 of patch
>can't find file to patch at input line 3
>Perhaps you used the wrong -p or --strip option?
>The text leading up to this was:
>--------------------------
>|--- cz.717\mplayer.1   2004-09-14 08:33:40.000000000 +0200
>|+++ cz.718\mplayer.1   2004-09-15 13:39:06.000000000 +0200
>--------------------------
>File to patch:
>
>_______________________________________________
>MPlayer-DOCS mailing list
>MPlayer-DOCS at mplayerhq.hu
>http://mplayerhq.hu/mailman/listinfo/mplayer-docs
>.
>
>  
>