Re: GNU Patch version?

["Vincent Legoll" <vincent legoll gmail com>]

On Wed, Oct 22, 2008 at 7:20 PM, Rick Dynarski <rdynarski qualcomm com> wrote:
> I had this same problem and was able to track down the failure but am still
> looking at how to fix it.  The error dialogue happens on any file which fails
> when a patch is applied.  Patch fails whenever a diff is within 3 lines(normal
> diff context) of a SVN expanded keyword.  The happens because the patch file
> is generated from svn diff(which does not expand the keywords) but in
> vcview.show_patch the shutil.copyfile call copies the file from the tree and
> this contains all of the subversion keywords expanded.  When patch goes to
> apply the patch file it will fail because the patch looks like this:
>
> Index: Makefile
> ===================================================================
> --- Makefile    (revision 973)
> +++ Makefile    (working copy)
> @@ -1,4 +1,4 @@
> -#
> +#
>  # $Id$
>  #
>  # The following creates/sets a few fundamental shell variables for us
>
> But the actual file looks like this:
>
> #
> # $Id: Makefile 942 2008-10-17 18:55:48Z fubar $
> #
> # The following creates/sets a few fundamental shell variables for us
>
> Therefore, patch cannot figure out how to apply the patch because the diff
> file does not match the real file because in the diff the $Id$ keyword has not
> been expanded and in the copied file it has already been expanded by
> subversion.

Thanks for the additional information, this should be
helpful to reproduce & fix, I'm on holidays now so
won't be able to fix it, but it should not be too difficult

If you hadn't added those infos to any bug report,
please do so, so that other can have a shot at it.

-- 
Vincent Legoll