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

[Jason Dorje Short <jdorje@xxxxxxxxxxxx>]

Christian Knoke wrote:
> On Sat, Jan 01, 2005 at 05:24:38PM -0800, Jason Short wrote:
>
> > This patch fixes those problems.  It should work for both branches. 
> > There may be other problems; it's hard to see since not all strings are
> > translated.
>
> 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.
> > --- manual/civmanual.c  29 Dec 2004 04:56:16 -0000      1.7
> > +++ manual/civmanual.c  2 Jan 2005 01:23:36 -0000
> Maybe thats the reason, the equal names?
I doubt it.  It figures out the file name; it's the diff itself that it 
fails on.
-jason