Re: svn commit: r1765368 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/mod/mod_proxy_html.html.en docs/manual/mod/mod_proxy_html.xml

2016-10-17 Thread Daniel Shahaf 
Eric Covener wrote on Mon, Oct 17, 2016 at 16:33:36 -0400:
> On Mon, Oct 17, 2016 at 4:22 PM, Jacob Champion  wrote:
> > On 10/17/2016 01:15 PM, jchamp...@apache.org wrote:
> >>
> >> Log:
> >> Merge r1765361 from trunk:
> >
> >
> > Copy-pasted the wrong rev; this should have been r1765357. Sorry, first time
> > merging...
> 
> For straightforward backports some of us use:
> http://people.apache.org/~jorton/svn.merge

Subversion uses a cron job that automatically merges STATUS entries that
have received sufficient votes.  It creates commits such as this:

https://svn.apache.org/r1765006

Re: svn commit: r1765368 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/mod/mod_proxy_html.html.en docs/manual/mod/mod_proxy_html.xml

2016-10-17 Thread Jacob Champion 

On 10/17/2016 01:33 PM, Eric Covener wrote:

For straightforward backports some of us use:
http://people.apache.org/~jorton/svn.merge


Awesome, thanks for the tip!

--Jacob

Re: svn commit: r1765368 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/mod/mod_proxy_html.html.en docs/manual/mod/mod_proxy_html.xml

2016-10-17 Thread Eric Covener 
On Mon, Oct 17, 2016 at 4:22 PM, Jacob Champion  wrote:
> On 10/17/2016 01:15 PM, jchamp...@apache.org wrote:
>>
>> Log:
>> Merge r1765361 from trunk:
>
>
> Copy-pasted the wrong rev; this should have been r1765357. Sorry, first time
> merging...

For straightforward backports some of us use:
http://people.apache.org/~jorton/svn.merge

Re: svn commit: r1765368 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/mod/mod_proxy_html.html.en docs/manual/mod/mod_proxy_html.xml

2016-10-17 Thread Jacob Champion 

On 10/17/2016 01:15 PM, jchamp...@apache.org wrote:

Log:
Merge r1765361 from trunk:


Copy-pasted the wrong rev; this should have been r1765357. Sorry, first 
time merging...


--Jacob