[Freeciv-Dev] Re: pathnames in CVS snapshot diffs

[Greg Wooledge <wooledge@xxxxxxxxxxx>]

Jed Davis (jldavis@xxxxxxxxxxxxxx) wrote:

> diff -H -u -r --new-file 
> ../../freeciv-Jul-04/freeciv/client/gui-beos/App.cpp 
> ./client/gui-beos/App.cpp
> --- ../../freeciv-Jul-04/freeciv/client/gui-beos/App.cpp      Mon Jun 19 
> 16:28:02 2000
> +++ ./client/gui-beos/App.cpp Wed Jul  5 04:24:05 2000
> 
> Since I use "patch -p3" in /usr/src, this tends to leave files in /usr/src/ 
> instead of the correct directory, thereby breaking the source tree.

You should be using "-p1" or "-p0" from the "freeciv" directory (perhaps
this is "/usr/src/freeciv" for you).

The "-p" option to patch goes by the second name, not the first name.

-- 
Greg Wooledge                    | "Truth belongs to everybody."
wooledge@xxxxxxxxxxx             |   Red Hot Chili Peppers
http://www.kellnet.com/wooledge/ |

pgpMLurFvHii2.pgp
Description: PGP signature