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

Joel Brobecker
2012-04-17T14:55:15Z

> 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.

I am OK with your version. I think this part is considered
documentation and is more Eli's domain, so please wait for his
approval.

I also think that 2 GMs agreeing to remove "diff -cp" is enough
to proceed, but I can take care of removing this part once your
patch is in. I don't want you to keep flip-flopping just because
of me.

Cheers,
--
Joel

> 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),