* * * * * * * * * * * * * * * * * * * * * * * * * * * *
      *                                                     *
      *  THIS RELEASE STREAM IS OPEN TO BUG FIXES.          *
      *                                                     *
      * * * * * * * * * * * * * * * * * * * * * * * * * * * *

This file tracks the status of releases in the 1.7.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.7.0:

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

 * r1146131 and followups
   Add svn_fs_verify() and implement rep-cache verification in FSFS using it.
   Branch:
     1.7.x-fs-verify
   Justification:
     Would be nice to extend verify already in 1.7.x.
   Notes:
     This does not include progress reporting; that has been postponed to 1.8.
   Conflicts:
     On fs_fs.c.  Resolve with 'theirs-conflict'.
   Votes:
     +1: danielsh, rhuijben
     +0: gstein (progress would be nice) (without r1161164, r1161180)
     -0: cmpilato (For a function with this name, the implementation is far
         too anemic. I'd prefer this be a private function in 1.7.x, leaving
         room for a future public API that really does full verification.)
         (without r1161164, r1161180)

 * r1147540, r1147541
   Remove unused variables in build system.
   Justification:
     Backporting of future changes will be easier.
   Votes:
     +1: arfrever
     -0: stsp (we can backport these when we need to)

 * r1154278, r1154379, r1154382
   Make 'svn ls' capable of listing Subversion 1.0-1.3 repositories using
   ra_serf.
   Justification:
     We promised not to break backwards compatibility and it is not nice
     that serf doesn't want to list the neon repository.
     (Check svn ls http://svn.webdav.org/repos/projects/neon/)
   Notes:
     r1154278 is a quick hack to detect old servers and to at least return
              some information.
     r1154379 is the real fix: fallback to a more compatible request.
     r1154382 makes sure the right result is used directly after falling
              back from svn_ra_serf__get_dir.
              (Most likely the problem is detected earlier than this function)
   Votes:
     +1: rhuijben, cmpilato

 * r1161683, r1161721
   Fix issue #3976 "record-only merges which add new subtree mergeinfo don't
   record mergeinfo describing merge".
   Justification:
      Avoid repeat merges and possible spurious conflicts in merges subsequent
      to a --record-only merge which adds mergeinfo to a subtree which had no
      explicit mergeinfo prior to the merge.  Ok, that's a mouthful, to put it
      more succinctly: A --record-only merge of revision X should block future
      merges of revision X, but that wasn't happening here.
   Notes:
     r1161683 is a new test for this issue and r1161721 is the fix.
   Branch:
     ^/subversion/branches/1.7.x-issue3976
   Votes:
     +1: pburba

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

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