svn commit: r1827124 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_client/conflicts.c subversion/tests/libsvn_client/conflicts-test.c

2018-03-17 Thread svn-role
Author: svn-role Date: Sun Mar 18 04:00:07 2018 New Revision: 1827124 URL: http://svn.apache.org/viewvc?rev=1827124=rev Log: Merge the r1825709 group from trunk: * r1825709, r1825711 Don't offer conflict resolution options for 'local move vs incoming move'. Justication: The resolver

svn commit: r1827126 - in /subversion/branches/1.10.x: ./ STATUS build.conf subversion/libsvn_delta/svndiff.c subversion/tests/libsvn_delta/ subversion/tests/libsvn_delta/svndiff-stream-test.c

2018-03-17 Thread svn-role
Author: svn-role Date: Sun Mar 18 04:00:13 2018 New Revision: 1827126 URL: http://svn.apache.org/viewvc?rev=1827126=rev Log: Merge r1826747 from trunk: * r1826747 Fix a cause of unexpected short reads on the stream returned by the svn_txdelta_to_svndiff_stream() API. Justification:

svn commit: r1827125 - in /subversion/branches/1.10.x: ./ STATUS subversion/tests/libsvn_subr/utf-test.c

2018-03-17 Thread svn-role
Author: svn-role Date: Sun Mar 18 04:00:10 2018 New Revision: 1827125 URL: http://svn.apache.org/viewvc?rev=1827125=rev Log: Merge the r1825783 group from trunk: * r1825783, r1825787, r1825788 Ensure test data is correctly aligned before calling svn_utf__utf{16,32}_to_utf8

svn commit: r1827114 - in /subversion/trunk/subversion/tests/cmdline: davautocheck.sh svnserveautocheck.sh

2018-03-17 Thread philip
Author: philip Date: Sat Mar 17 22:52:30 2018 New Revision: 1827114 URL: http://svn.apache.org/viewvc?rev=1827114=rev Log: * subversion/tests/cmdline/svnserveautocheck.sh: Document environment variables interpreted by the script. * subversion/tests/cmdline/davautocheck.sh: tweak documentation

svn commit: r1827100 - /subversion/branches/1.10.x/STATUS

2018-03-17 Thread brane
Author: brane Date: Sat Mar 17 19:24:46 2018 New Revision: 1827100 URL: http://svn.apache.org/viewvc?rev=1827100=rev Log: * branches/1.10.x/STATUS: Veto r1825979. Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL:

svn commit: r1827103 - /subversion/branches/1.10.x/STATUS

2018-03-17 Thread brane
Author: brane Date: Sat Mar 17 19:45:55 2018 New Revision: 1827103 URL: http://svn.apache.org/viewvc?rev=1827103=rev Log: * branches/1.10.x/STATUS: Approve r1826747. Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL:

svn commit: r1827099 - /subversion/branches/1.10.x/STATUS

2018-03-17 Thread brane
Author: brane Date: Sat Mar 17 19:20:31 2018 New Revision: 1827099 URL: http://svn.apache.org/viewvc?rev=1827099=rev Log: * branches/1.10.x/STATUS: Approve the r1825709 group. Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL:

svn commit: r1827105 - in /subversion/trunk/subversion/tests/cmdline: davautocheck.sh svnserveautocheck.sh

2018-03-17 Thread philip
Author: philip Date: Sat Mar 17 20:48:57 2018 New Revision: 1827105 URL: http://svn.apache.org/viewvc?rev=1827105=rev Log: Add FSFS block-read support to davautocheck and svnserveautcheck. Now make davautocheck BLOCK_READ=1 make svnserveautocheck BLOCK_READ=1 will enable block-read in

svn commit: r1827102 - /subversion/branches/1.10.x/STATUS

2018-03-17 Thread brane
Author: brane Date: Sat Mar 17 19:31:15 2018 New Revision: 1827102 URL: http://svn.apache.org/viewvc?rev=1827102=rev Log: * branches/1.10.x/STATUS: Approve the r1825783 group. Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL: