[Freeciv-Dev] Re: Improved game starting version 6 [patch] [ready, IMO] (PR#1215)

[Daniel L Speyer <dspeyer@xxxxxxxxxxx>]

On Thu, 10 Jan 2002, [iso-8859-1] Daniel Sjölie wrote:

> On 2002-01-09 13:51:53, Daniel L Speyer wrote:
> > The sixth version of the game starting patch is now available by
> > ftp.  This is mostly cleanup, because I've run out of features that need
> > including.  I've been playtesting it for a while, and it works nicely.  I
> > think it's ready for inclusion (please review it as such).
> 
> Would that be ftp://ftp.freeciv.org/freeciv/incoming/conndlg6.patch ? :)
> 
> I get this when I try to apply this patch:
> 
> source@abyss~/freeciv/test>patch -p1 < ../patches/conndlg6.patch 
> patching file client/civclient.c
> patching file client/clinet.c
> patching file client/gui-gtk/chatline.c
> patch: **** malformed patch at line 74: diff -u -r
> freeciv-12-23-01/client/gui-gtk/connectdlg.c
> freeciv/client/gui-gtk/connectdlg.c
> 
> source@abyss~/freeciv/test>
> 
> And when I removed that part I got the same error again further down...
> 

That's the file and that's the line, but I can't see what's malformed
about it.  I assume there's nothing obviously wrong with the file as
downloaded.

Anyway, I've uploaded a tgz of the altered files to the same place; it's
only 42k, so that should work until we can see what's wrong with the
patch.

--Daniel Speyer
"May the /src be with you, always"


> /Daniel
> 
> -- 
> Now take a deep breath, smile and don't take life so seriously... :)
>