On Thu, May 16, 2013 at 11:18 PM, Ivan Zhakov <i...@visualsvn.com> wrote:

> On Fri, May 17, 2013 at 12:58 AM,  <stef...@apache.org> wrote:
> > Author: stefan2
> > Date: Thu May 16 20:58:07 2013
> > New Revision: 1483565
> >
> > URL: http://svn.apache.org/r1483565
> > Log:
> > * STATUS: add r1483557 and vote for it
> >
> > 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=1483565&r1=1483564&r2=1483565&view=diff
> >
> ==============================================================================
> > --- subversion/branches/1.8.x/STATUS (original)
> > +++ subversion/branches/1.8.x/STATUS Thu May 16 20:58:07 2013
> > @@ -116,6 +116,14 @@ Candidate changes:
> >     Votes:
> >       +1: stsp, rhuijben
> >
> > +* r1483557
> > +  Match our revision property names exactly instead by prefix.
> > +  Justification:
> > +    While the impact of this bug is certainly low, it is still an easy
> > +    to fix problem.
> > +  Votes:
> > +     +1: stefan2 (for 1.8.1)
> > +
> >  Approved for 1.8.1 or when we release a new RC:
> >  ===============================================
> >
> > @@ -133,6 +141,7 @@ Approved for 1.8.1 or when we release a
> >     Votes:
> >       +1: philip, rhuijben, stsp
> >
> > +>>>>>>> .r1483563
> ^^^^^^ conflict marker?
>

Why keeps everyone complaining when a simple fix would be quicker ... ;)

-- Stefan^2.

-- 
*Join one of our free daily demo sessions on* *Scaling Subversion for the
Enterprise <http://www.wandisco.com/training/webinars>*
*

*

Reply via email to