On Sat, Jun 1, 2013 at 1:28 AM, <danie...@apache.org> wrote: > Author: danielsh > Date: Sat Jun 1 05:28:20 2013 > New Revision: 1488464 > > URL: http://svn.apache.org/r1488464 > Log: > * STATUS: Block the r1488183 entry until Paul confirms what the revisions are. > > 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=1488464&r1=1488463&r2=1488464&view=diff > ============================================================================== > --- subversion/branches/1.8.x/STATUS (original) > +++ subversion/branches/1.8.x/STATUS Sat Jun 1 05:28:20 2013 > @@ -64,6 +64,7 @@ Candidate changes: > Justification: > Prevents a segfault in the new 'internal text conflict merge tool'. > Votes: > + -1: danielsh (Paul: I think you meant r1488267)
Hi Daniel - Quite right, I did mean r1488267. I fixed that in STATUS. > +1: pburba (for 1.8.0: This isn't a 'destabilizing' change per my > reading of our release-stabilization guidelines, so it can > be included in 1.8.0 without a soak restart.) > > -- Paul T. Burba CollabNet, Inc. -- www.collab.net -- Enterprise Cloud Development Skype: ptburba
