* * * * * * * * * * * * * * * * * * * * * * * * * * * *
      *                                                     *
      *  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.12:
================

Candidate changes:

 * r879766
   Fix issue #3498: Subversion password stores freeze Eclipse
   Justification:
     All subclipse users are in great need of this.
   Branch:
     Resolves a minor conflict in libsvn_auth_gnome_keyring/gnome_keyring.c
     where the code changed was refactored on trunk.
     ^/subversion/branches/1.6.x-r39692
   Votes:
     +1: stylesen
     +0: julianfoad (reviewed, not tested)
     -0: rhuijben (needs more explanation: The not-interactive and no
                   callback code paths should be more similar if the code
                   works correctly. I think the not interactive code path
                   needs the same fix).

 * r878590, r878607, r878625, r878626, r878627
   In trunk we optimized the common case of 'find-and-replace with same uri'
   of proxied content thanks to issue 3445 "WebDAV proxy code munging user
   data".
   r878590 is just a change that adds FIXME marker to code comment. We take it
   to avoid spurious conflicts with other revisions.
   r878607 Special cases no-op find and replace.
   "r878625, r878626, r878627" are follow-up to r878607 and the other long 
   pending Master info leak to the clients.
   Justification:
     1. This group has the most common 'optimization' fix of *not* groking the
        proxied response to find and replace with same string.
     2. Fixes the master information leak via the Location header.
     3. Need this to be ported for the other defect to be ported
        without conflict.
   Votes:
     +1: kameshj, cmpilato
     -0: julianfoad (seem to be multiple changes here for different reasons -
           at least issue '3445 and an optimization and an information leak;
           r878607 log msg says it fixes bugs but it's not clear what bugs;
           don't know how to tell whether justification 1 is significant;
           justifications don't seem to refer to issue #3445. Please can we
           separate these changes and clearly describe each one? And update
           the r878607 log msg.)

 * r916286, r917512
   Issue description:
    With the below apache configuration(See the trailing slash at the 
    end of '/svn/').

    <Location /svn/>
     DAV svn
     SVNParentPath /repositories
     #See the trailing slash on the master URI also can cause the confusion.
     SVNMasterURI http://master/svn/
     SVNAdvertiseV2Protocol Off
    </Location>

   Vague and useless error message *without* this fix on client side is
   snipped below.
   <snip>
   svn: Commit failed (details follow):
   svn: MKACTIVITY of '/svn/demujin/!svn/act/4b6d547c-018d-4e02-9d3f-2b283076cc06': Could not read status line: connection was closed by server (http://localhost)
   </snip>


   Notes:
     This backport depends on the r878590 group only for the conflict free port.
   Justification:
    With this fix commit successfully gets proxied and succeeds.
   Votes:
     +1: kameshj

 * r917523
     If the configured slave url has the *uri encodable* characters(<space>,
     '?', '%') *write through* is not happening rather commit happens in
     slave itself.
   Notes:
     This backport depends on the r878590 and r916286 groups only for the
     conflict free port.
   Justification:
    With this commit we avoid accidental commit to the slave and hence 
    making it unusable as a proxy anymore.
   Votes:
     +1: kameshj

 * r939375-939376
   Fix issue #3623, a bug in foreign repository merges that causes properties
   on merge-added files to be dropped from commits of those merges.
   Justification:
     This can actually result in what is arguably a corrupt working copy,
     one that thinks it is in sync with the repository but actually is not.
   Notes:
     r939375 tweaks a test to cover this case.  r939376 is the fix.
   Branch:
     ^/subversion/branches/1.6.x-issue3623
   Votes:
     +1: cmpilato, pburba

 * r950445, 950468
   Fix for issue #2591 "'svnadmin hotcopy' does not replicate symlinks".
   Justification:
     This fix helps server administrators who has common files symlinked
     across their repositories and take frequent backups of their repos
     using svnadmin hotcopy.
   Notes:
     r950445 fixes the issue and r950468 is a test for this issue.
   Votes:
     +1: stylesen,
     -0: julianfoad, cmpilato (Tested and works fine, but changes
           semantics of svn_io_dir_walk() which we should not do in a
           back-port.  Discussing on list.)

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

 * r877552, r877617, r877618, r877619, r877621
   Support using `svnversion` on files and improve some messages printed by
   `svnversion`.
   Justification:
     Some messages printed by `svnversion` are inconsistent and sometimes
     incorrect:
     $ svnversion /usr
     exported
     $ svnversion /bin/ls
     '/bin/ls' not versioned, and not exported
     $ svnversion VERSIONED_FILE
     'VERSIONED_FILE' not versioned, and not exported
     $ svnversion /nonexistent
     subversion/libsvn_wc/questions.c:90: (apr_err=2)
     svn: '/nonexistent' does not exist
     ^^^
     Messages with these revisions backported:
     $ svnversion /usr
     Unversioned directory
     $ svnversion /bin/ls
     Unversioned file
     $ svnversion VERSIONED_FILE
     NUMBER
     $ svnversion /nonexistent
     '/nonexistent' doesn't exist
   Votes:
     +1: arfrever
     -0: cmpilato (Introduces new features and changes output)
     -1: rhuijben (Introduces new features and changes output;
                   I think it should be removed from STATUS)

 * r878078, r878088, r878102, r878196
   Make KWallet window attached to terminal window.
   Justification:
     Without this change, KWallet window can appear behind terminal window
     and is left after killing terminal.
   Votes:
     +1: arfrever
     -0: peters
     -1: stsp, rhuijben ("/proc/%ld/stat" is ugly and Linux-specific -
                         would just getenv("WINDOWID") work instead?)

 * r921453, r927184, r927243
   Fix reopened issue #3020 'Reflect dropped/renumbered revisions in
   svn:mergeinfo data during svnadmin load'
   Justification:
     Prior to this fix, when loading a partial dump with mergeinfo, the
     resulting mergeinfo in the target repository could refer to non-existent
     revisions or revisions that have nothing to do with the merge source
     in the original repository.  The original fix for issue assumed that
     the dump stream was for a complete repository.
   Notes:
     r921453 and 927184 are tests, r927243 is the fix.
   Branch:
     ^/subversion/branches/1.6.x-issue3020
   Votes:
     +1: kameshj
     -1: pburba (There is a regression with this fix, see
         http://svn.haxx.se/dev/archive-2010-03/0716.shtml)

 * r933194
   Fix for issue #2753
   SVNListParentPath feature doesn't work when svn authz is used.
   Justification:
     This issue is waiting for resolution for more than 3 years.
   Notes:
     See discussion at http://svn.haxx.se/dev/archive-2010-04/0275.shtml
   Votes:
     -1: cmpilato (pending results of aforemented discussion)

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