* * * * * * * * * * * * * * * * * * * * * * * * * * * *
      *                                                     *
      *  THIS RELEASE STREAM IS OPEN FOR STABILIZATION.     *
      *                                                     *
      * * * * * * * * * * * * * * * * * * * * * * * * * * * *

This file tracks the status of releases in the 1.10.x line.

See http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
for details on how release lines and voting work, what kinds of bugs can
delay a release, etc.

Status of 1.10.2:

Candidate changes:
==================

 * r1830083, r1833864, r1833866
   Fix issue #4739, "Accept incoming deletion" option doing nothing
   for a locally deleted file
   Justification:
     Fixes undesirable conflict resolver behaviour.
   Notes:
     r1830083 adds a regression test
     r1833864 fixes the issue
     r1833866 is a small follow-up fix
     Issue #4744 fix should be merged after this to avoid merge conflicts.
   Votes:
     +1: stsp, jcorvel

 * r1833895, r1833897, r1833899, r1833901
   Fix issue #4744 "during merge: assertion failed (start_rev > end_rev)"
   Justification:
     Fixes undesirable conflict resolver behaviour.
   Notes:
     r1833895 adds a regression test
     r1833897 prevents offer of a non-working resolution option
     r1833899 fixes accidental test breakage introduced by r1833897
     r1833901 prevents the assertion failure and adjusts the test
     Issue #4739 fix should be merged before this to avoid merge conflicts.
  Votes:
    +1: stsp, jcorvel

 * r1833465
   Enforce the v1 HTTP protocol when a client sends PUT before CHECKOUT.
   Justification:
     Return an error when the client gets the protocol wrong.
   Votes:
     +1: philip, jamessan

 * r1834612, r1834835
   On the '1.10.x-issue4758' branch: Fix SVN-4758 "Unable to shelve changes
   when using custom diff-cmd".
   Justification:
     User-reported breakage of 'svn shelve'.
   Branch: ^/subversion/branches/1.10.x-issue4758
   Votes:
     +1: julianfoad, jamessan

Veto-blocked changes:
=====================

Approved changes:
=================