Luca Toscano wrote on Sat, Sep 10, 2016 at 12:45:35 +0200: > 2016-09-10 12:22 GMT+02:00 <[email protected]>: > > +++ 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
