[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: gnu diff (was Re: does it really need gnu patch?)

From: Perry E. Metzger <perry_at_piermont.com>
Date: 2001-11-25 01:01:27 CET

Ben Collins-Sussman <sussman@collab.net> writes:
> But if I run the *real* GNU diff, compiled straight out of diffutils,
> the patch file looks like:
>
> --- foofile Sat Nov 24 17:42:02 2001
> +++ foofile2 Sat Nov 24 17:41:53 2001
> @@ -1 +1 @@
> -fooooextra text
> \ No newline at end of file
> +foooo
> \ No newline at end of file

Here is what it looks like on NetBSD:

$ more foofile.patch
--- foofile Sat Nov 24 18:56:02 2001
+++ foofile2 Sat Nov 24 18:56:02 2001
@@ -1 +1 @@
-some text, no newline...extra text, still no newline
\ No newline at end of file
+some text, no newline
\ No newline at end of file

That would seem to indicate that our diff is fine.

The problem appears to be our version of patch. It bitches about the
patch being malformed, as you note. I'm going to try to add the needed
feature to our patch so that it does not fail any longer.

Perry

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:49 2006

This is an archived mail posted to the Subversion Dev mailing list.