docs/88427: Diff (1) error.

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

docs/88427: Diff (1) error.

Jimmie James

>Number:         88427
>Category:       docs
>Synopsis:       Diff (1) error.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:      
>Date-Required:
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 03 02:40:17 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Jimmie James
>Release:        FreeBSD 6.0-RC1
>Organization:
Toronto 2600
>Environment:
FreeBSD fortytwo.zapto.org 6.0-RC1 FreeBSD 6.0-RC1 #0: Fri Oct 21 20:25:22 EDT 2005     [hidden email]:/usr/obj/usr/src/sys/FORTYTWO  i386

>Description:
man (1) diff says to use        diff -crN foo.orig foo >foo.diff  to create a diff patch, where it should be -urN (as told to me by dho on ##freebsd)
>How-To-Repeat:
Read the man (1) diff and on the website http://www.freebsd.org/cgi/man.cgi?query=diff&sektion=1

>Fix:
--- diff.orig   Wed Nov  2 21:31:06 2005
+++ diff.1      Wed Nov  2 21:31:17 2005
@@ -494,7 +494,7 @@
 .B send-pr(1)
 program), you could type
 .sp
-diff -crN foo.orig foo >foo.diff
+diff -urN foo.orig foo >foo.diff
 .sp
 where
 .I foo.orig

>Release-Note:
>Audit-Trail:
>Unformatted:
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-doc
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: docs/88427: Diff (1) error.

Giorgos Keramidas-2
The following reply was made to PR docs/88427; it has been noted by GNATS.

From: Giorgos Keramidas <[hidden email]>
To: Jimmie James <[hidden email]>
Cc: [hidden email]
Subject: Re: docs/88427: Diff (1) error.
Date: Thu, 3 Nov 2005 18:28:49 +0200

 On 2005-11-03 02:32, Jimmie James <[hidden email]> wrote:
 > man (1) diff says to use diff -crN foo.orig foo >foo.diff to create
 > a diff patch, where it should be -urN (as told to me by dho on
 > ##freebsd)
 
 Both ways are valid.  This is not a bug in the manpage.
 
 It may be preferrable to use one of the two in some cases, but that's
 definitely not something that we have to document as "The One True
 Way" of generating patches.
 
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-doc
To unsubscribe, send any mail to "[hidden email]"