You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ds...@apache.org on 2023/08/21 16:49:01 UTC
svn commit: r1911830 - /subversion/branches/1.14.x/STATUS
Author: dsahlberg
Date: Mon Aug 21 16:49:00 2023
New Revision: 1911830
URL: http://svn.apache.org/viewvc?rev=1911830&view=rev
Log:
* branches/1.14.x/STATUS:
Add ending newline to see if it resolves backport jobs not succeeding
Modified:
subversion/branches/1.14.x/STATUS
Modified: subversion/branches/1.14.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1911830&r1=1911829&r2=1911830&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Mon Aug 21 16:49:00 2023
@@ -48,3 +48,4 @@ Approved changes:
Bug fix. Code to parse forward merges did not work as intended.
Votes:
+1: hartmannathan, stsp, dsahlberg
+
Re: svn commit: r1911830 - /subversion/branches/1.14.x/STATUS
Posted by Daniel Sahlberg <da...@gmail.com>.
ons 23 aug. 2023 kl. 02:54 skrev Nathan Hartman <ha...@gmail.com>:
> On Tue, Aug 22, 2023 at 7:08 PM Nathan Hartman <ha...@gmail.com>
> wrote:
> >
> > On Mon, Aug 21, 2023 at 12:59 PM Daniel Sahlberg <
> daniel.l.sahlberg@gmail.com> wrote:
> >>
> >> I'm at a loss why the backport.pl script doesn't do the backport of
> the approved r1906502. When running the script manually, it reports the
> candidate changes but nothing under Approved.
> >>
> >> [[[
> >> svnsvn@svn-qavm1:~/src/svn/1.14.x$ ../trunk/tools/dist/backport.pl
> >>
> >>
> >> === Candidate changes:
> >>
> >>
> >> >>> The r1890223 group:
> >> r1890223, r1890668, r1890673
> >>
> >> Support building on Win64/ARM64.
> >>
> >> [...]
> >> libsvn_client: Pass redirected URL for file externals.
> >>
> >> +1: dsahlberg, stsp
> >>
> >> Run a merge? [y,l,v,±1,±0,q,e,a, ,N,?]
> >>
> >>
> >> === Veto-blocked changes:
> >>
> >>
> >> === Approved changes:
> >> svnsvn@svn-qavm1:~/src/svn/1.14.x$
> >> ]]]
> >>
> >> I'm sure there is some subtle formatting error in the approved change,
> but I can't see it.
> >
> >
> >
> > I think it needs one more newline between the row of equal signs and " *
> r1906502"
>
> Added that in r1911850.
That was indeed the issue. Thanks for figuring this out!
Kind regards
Daniel
Re: svn commit: r1911830 - /subversion/branches/1.14.x/STATUS
Posted by Daniel Sahlberg <da...@gmail.com>.
ons 23 aug. 2023 kl. 02:54 skrev Nathan Hartman <ha...@gmail.com>:
> On Tue, Aug 22, 2023 at 7:08 PM Nathan Hartman <ha...@gmail.com>
> wrote:
> >
> > On Mon, Aug 21, 2023 at 12:59 PM Daniel Sahlberg <
> daniel.l.sahlberg@gmail.com> wrote:
> >>
> >> I'm at a loss why the backport.pl script doesn't do the backport of
> the approved r1906502. When running the script manually, it reports the
> candidate changes but nothing under Approved.
> >>
> >> [[[
> >> svnsvn@svn-qavm1:~/src/svn/1.14.x$ ../trunk/tools/dist/backport.pl
> >>
> >>
> >> === Candidate changes:
> >>
> >>
> >> >>> The r1890223 group:
> >> r1890223, r1890668, r1890673
> >>
> >> Support building on Win64/ARM64.
> >>
> >> [...]
> >> libsvn_client: Pass redirected URL for file externals.
> >>
> >> +1: dsahlberg, stsp
> >>
> >> Run a merge? [y,l,v,±1,±0,q,e,a, ,N,?]
> >>
> >>
> >> === Veto-blocked changes:
> >>
> >>
> >> === Approved changes:
> >> svnsvn@svn-qavm1:~/src/svn/1.14.x$
> >> ]]]
> >>
> >> I'm sure there is some subtle formatting error in the approved change,
> but I can't see it.
> >
> >
> >
> > I think it needs one more newline between the row of equal signs and " *
> r1906502"
>
> Added that in r1911850.
That was indeed the issue. Thanks for figuring this out!
Kind regards
Daniel
Re: svn commit: r1911830 - /subversion/branches/1.14.x/STATUS
Posted by Nathan Hartman <ha...@gmail.com>.
On Tue, Aug 22, 2023 at 7:08 PM Nathan Hartman <ha...@gmail.com> wrote:
>
> On Mon, Aug 21, 2023 at 12:59 PM Daniel Sahlberg <da...@gmail.com> wrote:
>>
>> I'm at a loss why the backport.pl script doesn't do the backport of the approved r1906502. When running the script manually, it reports the candidate changes but nothing under Approved.
>>
>> [[[
>> svnsvn@svn-qavm1:~/src/svn/1.14.x$ ../trunk/tools/dist/backport.pl
>>
>>
>> === Candidate changes:
>>
>>
>> >>> The r1890223 group:
>> r1890223, r1890668, r1890673
>>
>> Support building on Win64/ARM64.
>>
>> [...]
>> libsvn_client: Pass redirected URL for file externals.
>>
>> +1: dsahlberg, stsp
>>
>> Run a merge? [y,l,v,±1,±0,q,e,a, ,N,?]
>>
>>
>> === Veto-blocked changes:
>>
>>
>> === Approved changes:
>> svnsvn@svn-qavm1:~/src/svn/1.14.x$
>> ]]]
>>
>> I'm sure there is some subtle formatting error in the approved change, but I can't see it.
>
>
>
> I think it needs one more newline between the row of equal signs and " * r1906502"
Added that in r1911850.
Cheers,
Nathan
Re: svn commit: r1911830 - /subversion/branches/1.14.x/STATUS
Posted by Nathan Hartman <ha...@gmail.com>.
On Tue, Aug 22, 2023 at 7:08 PM Nathan Hartman <ha...@gmail.com> wrote:
>
> On Mon, Aug 21, 2023 at 12:59 PM Daniel Sahlberg <da...@gmail.com> wrote:
>>
>> I'm at a loss why the backport.pl script doesn't do the backport of the approved r1906502. When running the script manually, it reports the candidate changes but nothing under Approved.
>>
>> [[[
>> svnsvn@svn-qavm1:~/src/svn/1.14.x$ ../trunk/tools/dist/backport.pl
>>
>>
>> === Candidate changes:
>>
>>
>> >>> The r1890223 group:
>> r1890223, r1890668, r1890673
>>
>> Support building on Win64/ARM64.
>>
>> [...]
>> libsvn_client: Pass redirected URL for file externals.
>>
>> +1: dsahlberg, stsp
>>
>> Run a merge? [y,l,v,±1,±0,q,e,a, ,N,?]
>>
>>
>> === Veto-blocked changes:
>>
>>
>> === Approved changes:
>> svnsvn@svn-qavm1:~/src/svn/1.14.x$
>> ]]]
>>
>> I'm sure there is some subtle formatting error in the approved change, but I can't see it.
>
>
>
> I think it needs one more newline between the row of equal signs and " * r1906502"
Added that in r1911850.
Cheers,
Nathan
Re: svn commit: r1911830 - /subversion/branches/1.14.x/STATUS
Posted by Nathan Hartman <ha...@gmail.com>.
On Mon, Aug 21, 2023 at 12:59 PM Daniel Sahlberg <
daniel.l.sahlberg@gmail.com> wrote:
> I'm at a loss why the backport.pl script doesn't do the backport of the
> approved r1906502. When running the script manually, it reports the
> candidate changes but nothing under Approved.
>
> [[[
> svnsvn@svn-qavm1:~/src/svn/1.14.x$ ../trunk/tools/dist/backport.pl
>
>
> === Candidate changes:
>
>
> >>> The r1890223 group:
> r1890223, r1890668, r1890673
>
> Support building on Win64/ARM64.
>
> [...]
> libsvn_client: Pass redirected URL for file externals.
>
> +1: dsahlberg, stsp
>
> Run a merge? [y,l,v,±1,±0,q,e,a, ,N,?]
>
>
> === Veto-blocked changes:
>
>
> === Approved changes:
> svnsvn@svn-qavm1:~/src/svn/1.14.x$
> ]]]
>
> I'm sure there is some subtle formatting error in the approved change, but
> I can't see it.
>
I think it needs one more newline between the row of equal signs and " *
r1906502"
Nathan
Re: svn commit: r1911830 - /subversion/branches/1.14.x/STATUS
Posted by Nathan Hartman <ha...@gmail.com>.
On Mon, Aug 21, 2023 at 12:59 PM Daniel Sahlberg <
daniel.l.sahlberg@gmail.com> wrote:
> I'm at a loss why the backport.pl script doesn't do the backport of the
> approved r1906502. When running the script manually, it reports the
> candidate changes but nothing under Approved.
>
> [[[
> svnsvn@svn-qavm1:~/src/svn/1.14.x$ ../trunk/tools/dist/backport.pl
>
>
> === Candidate changes:
>
>
> >>> The r1890223 group:
> r1890223, r1890668, r1890673
>
> Support building on Win64/ARM64.
>
> [...]
> libsvn_client: Pass redirected URL for file externals.
>
> +1: dsahlberg, stsp
>
> Run a merge? [y,l,v,±1,±0,q,e,a, ,N,?]
>
>
> === Veto-blocked changes:
>
>
> === Approved changes:
> svnsvn@svn-qavm1:~/src/svn/1.14.x$
> ]]]
>
> I'm sure there is some subtle formatting error in the approved change, but
> I can't see it.
>
I think it needs one more newline between the row of equal signs and " *
r1906502"
Nathan
Re: svn commit: r1911830 - /subversion/branches/1.14.x/STATUS
Posted by Daniel Sahlberg <da...@gmail.com>.
I'm at a loss why the backport.pl script doesn't do the backport of the
approved r1906502. When running the script manually, it reports the
candidate changes but nothing under Approved.
[[[
svnsvn@svn-qavm1:~/src/svn/1.14.x$ ../trunk/tools/dist/backport.pl
=== Candidate changes:
>>> The r1890223 group:
r1890223, r1890668, r1890673
Support building on Win64/ARM64.
[...]
libsvn_client: Pass redirected URL for file externals.
+1: dsahlberg, stsp
Run a merge? [y,l,v,±1,±0,q,e,a, ,N,?]
=== Veto-blocked changes:
=== Approved changes:
svnsvn@svn-qavm1:~/src/svn/1.14.x$
]]]
I'm sure there is some subtle formatting error in the approved change, but
I can't see it.
Kind regards,
Daniel
Den mån 21 aug. 2023 kl 18:49 skrev <ds...@apache.org>:
> Author: dsahlberg
> Date: Mon Aug 21 16:49:00 2023
> New Revision: 1911830
>
> URL: http://svn.apache.org/viewvc?rev=1911830&view=rev
> Log:
> * branches/1.14.x/STATUS:
> Add ending newline to see if it resolves backport jobs not succeeding
>
> Modified:
> subversion/branches/1.14.x/STATUS
>
> Modified: subversion/branches/1.14.x/STATUS
> URL:
> http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1911830&r1=1911829&r2=1911830&view=diff
>
> ==============================================================================
> --- subversion/branches/1.14.x/STATUS (original)
> +++ subversion/branches/1.14.x/STATUS Mon Aug 21 16:49:00 2023
> @@ -48,3 +48,4 @@ Approved changes:
> Bug fix. Code to parse forward merges did not work as intended.
> Votes:
> +1: hartmannathan, stsp, dsahlberg
> +
>
>
>