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

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

See "Stabilizing and maintaining releases" in trunk/www/hacking.html for
details on how release lines and voting work, what kinds of bugs can
delay a release, etc.

Status of 1.6.1:
================

Candidate changes:

  * r36613, r36615, r36631, r36641
    Avoid potential segfault when dealing with subtree mergeinfo.
    Justification:
      One user reported a segfault due to the way, prior to this change, that
      we set children_with_mergeinfo elements to NULL rather than removing
      the elements from the array, see
      http://svn.haxx.se/dev/archive-2009-03/0382.shtml.
    Notes:
      While segfaults are serious, this one is not sufficient by itself to
      hold up 1.6.0 given that it is not a regression from 1.5.x, no one has
      been able to produce a reproduction recipe, and only one user has
      reported it (and they were able to work around it).  The fix itself is
      r36613, r36631, and r36641.  r36615 is a variable renaming change that
      is necessary to avoid a conflict.
    Votes:
      +1: pburba, rhuijben

 * r36178
   External merge-tool improvements.
   Justification:
     Makes automated merging easier, and also fixes a bug where a file
     which should be marked conflicted was consired sucessfully merged
     because the tool's exit status was not properly evaluated.
   Notes:
     The bug is only triggered when using an external merge tool with the
     --accept=launch option. I don't think we need to hold 1.6.0 on this.
   Votes:
     +1: stsp (I'd say it's a fix for a feature we already support (merge
               under control of external non-interactive tool), albeit
               the feature is currently so buggy that you can't use it.)
     
 * r36509
   Don't contact the server asking about implicit mergeinfo when the
   explicit mergeinfo tells us all we need to know about what to merge
   and what not to.
   Justification:
     Avoids needless communication with the server in some use cases.  For
     users with lots of subtree mergeinfo and slow network connections
     the performance improvement should be quite significant.
   Votes:
     +1: pburba

 * r37009
   Recommend SQLite 3.6.12.
   Votes:
     +1: arfrever, rhuijben
     -0: gstein (the release is a week old; let's see at least another week
                 or two behind it before modifying the 1.6.x recommendation)

  * r37072, r37083
    Fix issue #3392 'Parsing error with reverse merges and non-inheritable
    mergeinfo'
    Justification:
      Can cause repeat merges to break in the presence of non-inheritable
      mergeinfo.
    Notes:
      r37072 is a test for the issue, r37083 is the fix.
    Votes:
      +1: pburba

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