* [PATCH (pushed)] contrib: revert removal of CR character
@ 2023-01-17 11:56 Martin Liška
2023-01-17 12:14 ` Jakub Jelinek
0 siblings, 1 reply; 4+ messages in thread
From: Martin Liška @ 2023-01-17 11:56 UTC (permalink / raw)
To: gcc-patches; +Cc: Jakub Jelinek
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(-)
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH (pushed)] contrib: revert removal of CR character
2023-01-17 11:56 [PATCH (pushed)] contrib: revert removal of CR character Martin Liška
@ 2023-01-17 12:14 ` Jakub Jelinek
2023-01-17 13:02 ` [PATCH (pushed)] Ignore test_patches.txt in update-copyright.py Martin Liška
0 siblings, 1 reply; 4+ messages in thread
From: Jakub Jelinek @ 2023-01-17 12:14 UTC (permalink / raw)
To: Martin Liška; +Cc: gcc-patches
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH (pushed)] Ignore test_patches.txt in update-copyright.py.
2023-01-17 12:14 ` Jakub Jelinek
@ 2023-01-17 13:02 ` Martin Liška
2023-01-17 13:06 ` Jakub Jelinek
0 siblings, 1 reply; 4+ messages in thread
From: Martin Liška @ 2023-01-17 13:02 UTC (permalink / raw)
To: gcc-patches; +Cc: Jakub Jelinek
contrib/ChangeLog:
* update-copyright.py: Ignore test_patches.txt.
---
contrib/update-copyright.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/contrib/update-copyright.py b/contrib/update-copyright.py
index ac7a94743cf..f3691dc11cc 100755
--- a/contrib/update-copyright.py
+++ b/contrib/update-copyright.py
@@ -693,6 +693,7 @@ class ContribFilter(GenericFilter):
'Info.plist',
# Contains CR (^M).
'repro_fail',
+ 'test_patches.txt',
])
class GCCCopyright (Copyright):
--
2.39.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH (pushed)] Ignore test_patches.txt in update-copyright.py.
2023-01-17 13:02 ` [PATCH (pushed)] Ignore test_patches.txt in update-copyright.py Martin Liška
@ 2023-01-17 13:06 ` Jakub Jelinek
0 siblings, 0 replies; 4+ messages in thread
From: Jakub Jelinek @ 2023-01-17 13:06 UTC (permalink / raw)
To: Martin Liška; +Cc: gcc-patches
On Tue, Jan 17, 2023 at 02:02:42PM +0100, Martin Liška wrote:
> contrib/ChangeLog:
>
> * update-copyright.py: Ignore test_patches.txt.
LGTM.
> diff --git a/contrib/update-copyright.py b/contrib/update-copyright.py
> index ac7a94743cf..f3691dc11cc 100755
> --- a/contrib/update-copyright.py
> +++ b/contrib/update-copyright.py
> @@ -693,6 +693,7 @@ class ContribFilter(GenericFilter):
> 'Info.plist',
> # Contains CR (^M).
> 'repro_fail',
> + 'test_patches.txt',
> ])
>
> class GCCCopyright (Copyright):
> --
> 2.39.0
Jakub
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-01-17 13:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-17 11:56 [PATCH (pushed)] contrib: revert removal of CR character Martin Liška
2023-01-17 12:14 ` Jakub Jelinek
2023-01-17 13:02 ` [PATCH (pushed)] Ignore test_patches.txt in update-copyright.py Martin Liška
2023-01-17 13:06 ` Jakub Jelinek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).