* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * THIS RELEASE STREAM IS OPEN TO BUG FIXES. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * This file tracks the status of releases in the 1.9.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.9.2: Candidate changes: ================== * r1701488 Issue #4592 "fix contrib check-mime-type.pl for changes to 'svnlook proplist' output", http://subversion.tigris.org/issues/show_bug.cgi?id=4592 Justification: Make this contributed script work again, after 1.7.8 broke it. Notes: Brett Randall put effort into contributing this fix: see the dev@ email thread "[patch][reboot-topic] fix check-mime-type.pl for changes to 'svnlook proplist' output" started by him on 2015-08-07, archived at e.g. or . Votes: +0: julianfoad, rhuijben (he says it works, but I haven't reviewed or tested) * r1701598, r1701603, r1701611, r1701646 Make 'svn lock' and 'svn unlock' report (un)lock errors as failure Justification: A single lock or unlock failure doesn't affect the whole operation since 1.9, but this has the side effect of no longer producing an error at all on failures. This patch makes 'svn' return an error when at least one failure is reported by the locking code. Notes: r1701598 is the actual fix. The other patches simplify and fix test expectations. Votes: +1: rhuijben * r1703581 Allow simple resolving of binary file text conflicts Justification: Simple usability improvement. Use reported. Regression. Branch: ^/subversion/branches/1.9.x-r1703581 Votes: +1: rhuijben, philip * r1703688, 1703689 Fix merging deletes of svn:eol-style CRLF or CR files Justification: Resolves unnecessary tree conflicts. Any more reasons needed? :-) Votes: +1: rhuijben Veto-blocked changes: ===================== Approved changes: =================