httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Yann Ylavic <ylavic....@gmail.com>
Subject Re: svn commit: r1760148 - in /httpd/httpd/branches/2.4.x: ./ STATUS
Date Sat, 10 Sep 2016 12:04:25 GMT
On Sat, Sep 10, 2016 at 12:45 PM, Luca Toscano <elukey@apache.org> wrote:
>
> The diff are my two commits proposed to backport, that have been probably
> tracked in my local repo, but I am ignorant about the topic so I am going to
> stop and wait for a more expert opinion. It was of course not intended,
> really sorry if I have caused any issue.

No problem, that happens ;)

>
> IIUC I altered the mergeinfo tracking story with two commits that are not in
> 2.4.x yet, what would be the best way forward?

I just reverted r1760148 (but STATUS), with:
$ svn merge -c -1760148
https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x/
$ svn revert STATUS
$ svn ci ...

Regards,
Yann.

Mime
View raw message