Complete.Org: Mailing Lists: Archives: freeciv-dev: January 2005:
[Freeciv-Dev] Re: (PR#11758) civmanual bugs
Home

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

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: freeciv-dev@xxxxxxxxxxx
Subject: [Freeciv-Dev] Re: (PR#11758) civmanual bugs
From: Christian Knoke <chrisk@xxxxxxxxx>
Date: Sun, 2 Jan 2005 09:35:47 +0100

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

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

Christian

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



[Prev in Thread] Current Thread [Next in Thread]