[(pushed)] contrib: revert removal of CR character

Message ID 609b96b0-cee7-fd04-2795-ec16cd559a65@suse.cz
State Not Applicable
Headers
Series [(pushed)] contrib: revert removal of CR character |

Checks

Context Check Description
snail/gcc-patch-check fail Git am fail log

Commit Message

Martin Liška Jan. 17, 2023, 11:56 a.m. UTC
  contrib/ChangeLog:

	* gcc-changelog/test_patches.txt: The CR character was removed
	with ./contrib/update-copyright.py which I'm going to change.
---
 contrib/gcc-changelog/test_patches.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

 2.38.1
  

Comments

Jakub Jelinek Jan. 17, 2023, 12:14 p.m. UTC | #1
On Tue, Jan 17, 2023 at 12:56:32PM +0100, Martin Liška wrote:
> contrib/ChangeLog:
> 
> 	* gcc-changelog/test_patches.txt: The CR character was removed
> 	with ./contrib/update-copyright.py which I'm going to change.

We shouldn't be updating that file at all IMHO, shouldn't it be listed
among skip_files ?
> ---
>  contrib/gcc-changelog/test_patches.txt | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/contrib/gcc-changelog/test_patches.txt b/contrib/gcc-changelog/test_patches.txt
> index 2f1cd923a13..1d120f8e472 100644
> --- a/contrib/gcc-changelog/test_patches.txt
> +++ b/contrib/gcc-changelog/test_patches.txt
> @@ -3631,8 +3631,7 @@ index 0000000..d75da75
>  +pub fn main ()
>  +{
>  +// { dg-error "Isolated CR" "" { target *-*-* } .+1 }
> -+  //! doc cr
> - comment
> ++  //! doc cr
>  comment
>  +}
>  -- 
>  2.38.1
> -- 
> 2.39.0

	Jakub
  

Patch

diff --git a/contrib/gcc-changelog/test_patches.txt b/contrib/gcc-changelog/test_patches.txt
index 2f1cd923a13..1d120f8e472 100644
--- a/contrib/gcc-changelog/test_patches.txt
+++ b/contrib/gcc-changelog/test_patches.txt
@@ -3631,8 +3631,7 @@  index 0000000..d75da75
 +pub fn main ()
 +{
 +// { dg-error "Isolated CR" "" { target *-*-* } .+1 }
-+  //! doc cr
- comment
++  //! doc cr
 comment
 +}
 --