Re: [RFA] - Improve suggestions for generating patches in CONTRIBUTE

[Siva Chandra <sivachandra@google.com>]

[-- Attachment #1: Type: text/plain, Size: 863 bytes --]

Joel> Personally, I'd even get rid of the "diff -cp" alternative. We'll
Joel> continue accepting context diffs, but I think that suggesting it,
Joel> even if we say later on that we prefer unified diffs, will result
Joel> in more patches sent in that format.

Pedro> Completely agreed.  /me pokes at Stan.  :-)

Joel> If we do not want to remove
Joel> the context diff alternative, then at least let's put it second.

I have modified to put the context diff alternative second.  I did not
remove it altogether as I have not seen more support to removing it.

2012-04-17  Siva Chandra Reddy  <sivachandra@google.com>

        * CONTRIBUTE: Add "cvs diff -up" as a way to generate patches
        when accessing the CVS repository.  Add a note saying that the
        "-up" flavors of "cvs diff" and "diff" are preferred.

Thanks,
Siva Chandra

[-- Attachment #2: contribute_patch_v2.txt --]
[-- Type: text/plain, Size: 992 bytes --]

Index: CONTRIBUTE
===================================================================
RCS file: /cvs/src/src/gdb/CONTRIBUTE,v
retrieving revision 1.12
diff -u -p -r1.12 CONTRIBUTE
--- CONTRIBUTE	22 Aug 2009 17:08:09 -0000	1.12
+++ CONTRIBUTE	17 Apr 2012 06:52:34 -0000
@@ -71,9 +71,11 @@ o	Submitting Patches
 	documentation (i.e., .texi files).
 
 	The patch itself. If you are accessing the CVS repository use
-	"cvs update; cvs diff -cp"; else, use "diff -cp OLD NEW" or
-	"diff -up OLD NEW". If your version of diff does not support
-	these options, then get the latest version of GNU diff.
+	"cvs update; cvs diff -up" or "cvs update; cvs diff -cp"; else,
+	use "diff -up OLD NEW" or "diff -cp OLD NEW". The flavors with
+	"-up" option string are preferred. If your version of diff does
+	not support these options, then get the latest version of GNU
+	diff.
 
 	We accept patches as plain text (preferred for the compilers
 	themselves), MIME attachments (preferred for the web pages),