You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Jacob Champion <ch...@gmail.com> on 2016/10/17 20:22:41 UTC

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

On 10/17/2016 01:15 PM, jchampion@apache.org wrote:
> Log:
> Merge r1765361 from trunk:

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

--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

Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Eric Covener wrote on Mon, Oct 17, 2016 at 16:33:36 -0400:
> On Mon, Oct 17, 2016 at 4:22 PM, Jacob Champion <ch...@gmail.com> wrote:
> > On 10/17/2016 01:15 PM, jchampion@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

Posted by Jacob Champion <ch...@gmail.com>.
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

Posted by Eric Covener <co...@gmail.com>.
On Mon, Oct 17, 2016 at 4:22 PM, Jacob Champion <ch...@gmail.com> wrote:
> On 10/17/2016 01:15 PM, jchampion@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