[RFA] - Improve suggestions for generating patches in CONTRIBUTE

[RFA] - Improve suggestions for generating patches in CONTRIBUTE

[Siva Chandra]

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

This patch is in response to the discussion here:
http://sourceware.org/ml/gdb-patches/2012-04/msg00328.html

2012-04-16  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_v1.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	16 Apr 2012 07:15:57 -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 -cp" or "cvs update; cvs diff -up"; else,
+	use "diff -cp OLD NEW" or "diff -up 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),

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

[Joel Brobecker]

Hello Siva,

> 2012-04-16  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 for doing that.

Personally, I'd even get rid of the "diff -cp" alternative. We'll
continue accepting context diffs, but I think that suggesting it,
even if we say later on that we prefer unified diffs, will result
in more patches sent in that format.  If we do not want to remove
the context diff alternative, then at least let's put it second.

What do others think?

-- 
Joel

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

[Pedro Alves]

On 04/16/2012 03:44 PM, Joel Brobecker wrote:

> Hello Siva,
> 
>> 2012-04-16  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 for doing that.
> 
> Personally, I'd even get rid of the "diff -cp" alternative. We'll
> continue accepting context diffs, but I think that suggesting it,
> even if we say later on that we prefer unified diffs, will result
> in more patches sent in that format.  


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

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



-- 
Pedro Alves

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

[Siva Chandra]

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

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

[Joel Brobecker]

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

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

[Mark Kettenis]

> Date: Tue, 17 Apr 2012 07:54:52 -0700
> From: Joel Brobecker <brobecker@adacore.com>
> 
> > 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.

Make that 3.  Tristan's recent darwin diffs made me realise that I've
completely lost the skill to read diff -c output.

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

[Siva Chandra]

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

On Tue, Apr 17, 2012 at 8:24 PM, Joel Brobecker <brobecker@adacore.com> wrote:
> 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.

Since I have not heard from Eli yet, I have gone ahead and removed the
context diff flavor.

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

        * CONTRIBUTE: Use unified diff instead of context diff when
        generating patches.

[-- Attachment #2: contribute_patch_v3.txt --]
[-- Type: text/plain, Size: 883 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	24 Apr 2012 06:42:34 -0000
@@ -71,9 +71,9 @@ 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"; else, use "diff -up OLD NEW". 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),

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

[Eli Zaretskii]

> Date: Tue, 24 Apr 2012 12:27:42 +0530
> From: Siva Chandra <sivachandra@google.com>
> Cc: Pedro Alves <palves@redhat.com>, gdb-patches@sourceware.org, 
> 	Eli Zaretskii <eliz@gnu.org>
> 
> On Tue, Apr 17, 2012 at 8:24 PM, Joel Brobecker <brobecker@adacore.com> wrote:
> > 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.
> 
> Since I have not heard from Eli yet

Sorry, what is it that you've waited me to say?  If this is about
unified vs context diffs, then I have no preference; I can get along
with either kind.

Thanks.

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

[Joel Brobecker]

> Sorry, what is it that you've waited me to say?  If this is about
> unified vs context diffs, then I have no preference; I can get along
> with either kind.

I told Siva that this was considered documentation, and therefore
needed your approval for going in. Otherwise, I'm happy to approve :).

-- 
Joel

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

[Eli Zaretskii]

> Date: Tue, 24 Apr 2012 13:21:11 -0700
> From: Joel Brobecker <brobecker@adacore.com>
> Cc: Siva Chandra <sivachandra@google.com>, palves@redhat.com,
> 	gdb-patches@sourceware.org
> 
> > Sorry, what is it that you've waited me to say?  If this is about
> > unified vs context diffs, then I have no preference; I can get along
> > with either kind.
> 
> I told Siva that this was considered documentation, and therefore
> needed your approval for going in. Otherwise, I'm happy to approve :).

Sorry, I missed that.

Anyway, the change was a rather mechanical one and didn't really touch
any text otherwise, so it doesn't need my approval.  But I've read the
diffs now, and I'm OK with them.

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

[Siva Chandra]

Joel> I told Siva that this was considered documentation, and therefore
Joel> needed your approval for going in. Otherwise, I'm happy to approve :).

Eli> Anyway, the change was a rather mechanical one and didn't really touch
Eli> any text otherwise, so it doesn't need my approval.  But I've read the
Eli> diffs now, and I'm OK with them.

Thank you. Committed now.

/Siva Chandra