On Wed, Jun 12, 2013 at 8:52 AM, <rhuij...@apache.org> wrote: > Author: rhuijben > Date: Wed Jun 12 06:52:44 2013 > New Revision: 1492079 > > URL: http://svn.apache.org/r1492079 > Log: > * STATUS: Extend group and cast vote > > Modified: > subversion/branches/1.8.x/STATUS > > Modified: subversion/branches/1.8.x/STATUS > URL: > http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1492079&r1=1492078&r2=1492079&view=diff > ============================================================================== > --- subversion/branches/1.8.x/STATUS (original) > +++ subversion/branches/1.8.x/STATUS Wed Jun 12 06:52:44 2013 > @@ -122,12 +122,14 @@ Candidate changes: > Votes: > +1: stsp, rhuijben > > - * r1492005 > - Optimize 'svn mergeinfo --show-revs' network usage. > + * r1492005, r1492020 I tried to merge r1492020 to 1.8.x branch yesterday and got the conflicts. Did you able to merge it?
-- Ivan Zhakov CTO | VisualSVN | http://www.visualsvn.com