[Freeciv-Dev] Re: (PR#11758) civmanual bugs

[Christian Knoke <chrisk@xxxxxxxxx>]

On Sun, Jan 02, 2005 at 04:03:11AM -0500, Jason Dorje Short wrote:
> Christian Knoke wrote:
> >
> >I have problems with your patches, lately. I get:
> >
> >chris@karl:~/freeciv/cvs/manual$ patch --dry-run -p0 < ~/manual.diff 
> >patching file manual/civmanual.c
> >Hunk #1 FAILED at 140.
> >Hunk #2 FAILED at 300.
> >Hunk #3 FAILED at 329.
> >3 out of 3 hunks FAILED -- saving rejects to file manual/civmanual.c.rej
> 
> Odd.  When I see these with other people's patches the reason is usually 
> that they have a different newline format.  Windows uses \r\n while unix 
> /posix uses \n.  CVS adjusts this automatically but I don't know a way 
> to tell patch to deal with it.
> 
> However we're both on practically the same platform (debian/x86) so I 
> don't see how this could be the problem.

I have made the patch by hand and produced my own version of the diff. That
one works for me.

Christian


-- 
Christian Knoke            * * *            http://cknoke.de
* * * * * * * * *  Ceterum censeo Microsoft esse dividendum.

manual.my.diff
Description: Text document