You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Luca Toscano <el...@apache.org> on 2016/09/10 10:45:35 UTC

Re: svn commit: r1760148 - in /httpd/httpd/branches/2.4.x: ./ STATUS

2016-09-10 12:22 GMT+02:00 <el...@apache.org>:

> Author: elukey
> Date: Sat Sep 10 10:22:56 2016
> New Revision: 1760148
>
> URL: http://svn.apache.org/viewvc?rev=1760148&view=rev
> Log:
> Add proposal+vote for mod_proxy_fcgi
>
> Modified:
>     httpd/httpd/branches/2.4.x/   (props changed)
>     httpd/httpd/branches/2.4.x/STATUS
>
> Propchange: httpd/httpd/branches/2.4.x/
> ------------------------------------------------------------
> ------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sat Sep 10 10:22:56 2016
> @@ -2,4 +2,4 @@
>  /httpd/httpd/branches/2.4.17-protocols-http2:1701609-1705681
>  /httpd/httpd/branches/revert-ap-ldap:1150158-1150173
>  /httpd/httpd/branches/wombat-integration:723609-723841
> -/httpd/httpd/trunk:1200475,1200478,1200482,1200491,
> 1200496,1200513,1200550,1200556,1200580,1200605,[...]
>  1757540,1757662-1757663,1757985,1758003,1758083,1758307-1758311,1758446,
> 1758558,1759984,1760018
>

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.

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?

Regards,

Luca

Re: svn commit: r1760148 - in /httpd/httpd/branches/2.4.x: ./ STATUS

Posted by Luca Toscano <to...@gmail.com>.
2016-09-10 14:04 GMT+02:00 Yann Ylavic <yl...@gmail.com>:
>
>
> 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.
>

Thanks a lot Yann!

Regards,

Luca

Re: svn commit: r1760148 - in /httpd/httpd/branches/2.4.x: ./ STATUS

Posted by Yann Ylavic <yl...@gmail.com>.
On Sat, Sep 10, 2016 at 12:45 PM, Luca Toscano <el...@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.

Re: svn commit: r1760148 - in /httpd/httpd/branches/2.4.x: ./ STATUS

Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Luca Toscano wrote on Sat, Sep 10, 2016 at 12:45:35 +0200:
> 2016-09-10 12:22 GMT+02:00 <el...@apache.org>:
> > +++ svn:mergeinfo Sat Sep 10 10:22:56 2016
> > @@ -2,4 +2,4 @@
> > -/httpd/httpd/trunk:1200475,1200478,1200482,1200491,
> > 1200496,1200513,1200550,1200556,1200580,1200605,[...]
> >  1757540,1757662-1757663,1757985,1758003,1758083,1758307-1758311,1758446,
> > 1758558,1759984,1760018
> >
> 
> The diff are my two commits proposed to backport,

The emailed mergeinfo diffs used to be easier to read; see INFRA-9186.

> that have been probably tracked in my local repo,

For future reference: this would have shown up as " M     ."
in 'svn status'.  When you see that, you can just revert it with
'svn revert ./'; without -R it won't revert anything else.

I assume what happened was that you merged the commits to test the
backport and then reverted them with 'svn revert -R *'.  That reverts
everything *except* the working copy root.  To revert everything, 'svn
revert -R ./' is required.

Cheers,

Daniel