[bug-patch] Re: GNU patch: new 2.6 release

[Claudio Fontana]

Andreas Gruenbacher wrote:
[CUT]
> > In addition to that, I always had a problem when trying to apply -p0
> > patches that contain versioned filenames (containing "@@").
>
> Could you please give an example and describe what the expected and observed 
> behaviors are exactly?

The patch files contain paths like these:

--- /some/fullpath/source_file.c@@/main/80 2009-10-27
+++ /some/fullpath/source_file.c
...content of the patch

Patch is apparently confused by the MVFS versioned path containing @@,
and does not find the files to apply the changes to:

[CODE]

$ gpatch -p0 < 2009-11-09_some_patch.cc.diff
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /some/fullpath/source_file.c@@/main/80 2009-10-27 
17:33:12.000000000 +0100
|+++ /some/fullpath/source_file.c  2009-11-09 11:19:35.223098000 +0100

--------------------------
File to patch:

[/CODE]

If I strip the @@ part from the patch, it then applies ok.
However, it is indeed interesting to keep the original "from" version
of the change, to know exactly from which version of the file the
patch has been built.


I also got a compilation failure of the new version on sparc Solaris 10.

After I configure when I try to make the generated Makefile, I get:

$ make
make: Fatal error in reader: Makefile, line 49: Unexpected end of line seen

If I use GNU make I get

$ gmake
./update-version.sh: syntax error at line 24: `(' unexpected
gmake: *** [VERSION] Error 2

Are you using GNU make-specific features and/or bashisms in the
executed shell-scripts?

Let me know which files/information you want me to provide.

Thank you,

Claudio F.