[Freeciv-Dev] Re: (PR#3771) Uproar display of cities

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

ChrisK@xxxxxxxx wrote:
> On Fri, Jul 25, 2003 at 08:41:19AM -0700, Jason Short wrote:
> 
>>And an update.  Still untested.
>>
>>jason
> 
> 
> patch --dry-run -p0 < ../../diffs/uproar-2.diff 
> patching file client/packhand.c
> Hunk #1 FAILED at 457.
> Hunk #2 FAILED at 599.
> Hunk #3 succeeded at 630 (offset -5 lines).
> 2 out of 3 hunks FAILED -- saving rejects to file client/packhand.c.rej
> patching file client/tilespec.c
> patching file common/city.h
> Hunk #1 FAILED at 257.
> 1 out of 1 hunk FAILED -- saving rejects to file common/city.h.rej
> patching file common/packets.c
> patching file common/packets.h
> patching file server/citytools.c
> patching file server/maphand.h
> 
> 

It works fine for me.  Is your cvs up-to-date; are you using conflicting 
patches?  Try "cvs up -A".

jason