[commit] Remove ">>>>>> .r..." from a ChangeLog
diff mbox series

Message ID 2c66acc1-8f2e-8486-e374-676c73550b8e@codesourcery.com
State New
Headers show
Series
  • [commit] Remove ">>>>>> .r..." from a ChangeLog
Related show

Commit Message

Tobias Burnus Oct. 8, 2019, 10:46 a.m. UTC
commit 4958da0be3f08d5f715dc4b74a8e93db18ca1a9e
Author: burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Tue Oct 8 09:35:56 2019 +0000

     Remove '>>>' merge marker from changelog
     
     
     git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@276689 138bc75d-0d04-0410-961f-82ee72b054a4

Comments

Jakub Jelinek Oct. 8, 2019, 10:50 a.m. UTC | #1
On Tue, Oct 08, 2019 at 12:46:13PM +0200, Tobias Burnus wrote:
> commit 4958da0be3f08d5f715dc4b74a8e93db18ca1a9e
> Author: burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>
> Date:   Tue Oct 8 09:35:56 2019 +0000
> 
>     Remove '>>>' merge marker from changelog
>     git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@276689 138bc75d-0d04-0410-961f-82ee72b054a4
> 
> diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
> index 84ee818a49d..6e98130dd96 100644
> --- a/gcc/fortran/ChangeLog
> +++ b/gcc/fortran/ChangeLog
> @@ -153,7 +153,6 @@
>         (lang_decl): Add new optional_arg field.
>         (GFC_DECL_OPTIONAL_ARGUMENT): New macro.
> ->>>>>>> .r276463
>  2019-10-01  David Malcolm  <dmalcolm@redhat.com>

That should be replaced by empty line...

>         * error.c (gfc_diagnostic_starter): Clear the prefix before
> 

	Jakub
Tobias Burnus Oct. 8, 2019, 11:52 a.m. UTC | #2
Both my mailer and 
https://gcc.gnu.org/ml/gcc-patches/2019-10/msg00528.html show an empty 
line before the ">>>>" – as does the file itself.

Thus, there is already one – which should be enough.

Cheers,

Tobias,

who also thinks that email clients could be better in terms of line 
breaks and spacing.

On 10/8/19 12:50 PM, Jakub Jelinek wrote:
> On Tue, Oct 08, 2019 at 12:46:13PM +0200, Tobias Burnus wrote:
>> commit 4958da0be3f08d5f715dc4b74a8e93db18ca1a9e
>> Author: burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>
>> Date:   Tue Oct 8 09:35:56 2019 +0000
>>
>>      Remove '>>>' merge marker from changelog
>>      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@276689 138bc75d-0d04-0410-961f-82ee72b054a4
>>
>> diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
>> index 84ee818a49d..6e98130dd96 100644
>> --- a/gcc/fortran/ChangeLog
>> +++ b/gcc/fortran/ChangeLog
>> @@ -153,7 +153,6 @@
>>          (lang_decl): Add new optional_arg field.
>>          (GFC_DECL_OPTIONAL_ARGUMENT): New macro.
>> ->>>>>>> .r276463
>>   2019-10-01  David Malcolm  <dmalcolm@redhat.com>
> That should be replaced by empty line...
>
>>          * error.c (gfc_diagnostic_starter): Clear the prefix before
>>
> 	Jakub
Jakub Jelinek Oct. 8, 2019, 12:01 p.m. UTC | #3
On Tue, Oct 08, 2019 at 01:52:17PM +0200, Tobias Burnus wrote:
> Both my mailer and https://gcc.gnu.org/ml/gcc-patches/2019-10/msg00528.html
> show an empty line before the ">>>>" – as does the file itself.
> 
> Thus, there is already one – which should be enough.

Guess some issue in the mutt viewer, if I save it to a file and look at over
in less, it looks good (well, there are 2 spaces instead of one, so the
previous line is not empty, but has trailing space).

The patch is obvious in any case.

	Jakub
Florian Weimer Oct. 8, 2019, 12:03 p.m. UTC | #4
* Tobias Burnus:

> Both my mailer and
> https://gcc.gnu.org/ml/gcc-patches/2019-10/msg00528.html show an empty
> line before the ">>>>" – as does the file itself.
>
> Thus, there is already one – which should be enough.

Inline patches with

Content-Type: text/plain; charset="utf-8"; format=flowed

are inherently ambiguous.  If you use format=flowed, you need to post
them as attachments (without format=flowed).

Thanks,
Florian

Patch
diff mbox series

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 84ee818a49d..6e98130dd96 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -153,7 +153,6 @@ 
         (lang_decl): Add new optional_arg field.
         (GFC_DECL_OPTIONAL_ARGUMENT): New macro.
  
->>>>>>> .r276463
  2019-10-01  David Malcolm  <dmalcolm@redhat.com>
  
         * error.c (gfc_diagnostic_starter): Clear the prefix before