svn commit: r1831604 - in /subversion/branches/1.10.x: ./ STATUS build/ac-macros/lz4.m4 build/ac-macros/utf8proc.m4

2018-05-14 Thread svn-role
Author: svn-role Date: Tue May 15 04:00:06 2018 New Revision: 1831604 URL: http://svn.apache.org/viewvc?rev=1831604=rev Log: Merge r1829344 from trunk: * r1829344 Make configure --without-lz4 or --without-utf8proc into explicit errors. Justification: LZ4 and UTF8PROC are not optional

svn commit: r1831220 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_repos/authz_parse.c subversion/tests/libsvn_repos/authz-test.c

2018-05-08 Thread svn-role
Author: svn-role Date: Wed May 9 04:00:05 2018 New Revision: 1831220 URL: http://svn.apache.org/viewvc?rev=1831220=rev Log: Merge the r1831110 group from trunk: * r1831110, 1831112 Fix issue 4741: authz group cannot refer to multiple groups Justification: Regression from 1.9

svn commit: r1831143 - in /subversion/branches/1.10.x: ./ STATUS subversion/bindings/javahl/native/jniwrapper/jni_list.hpp

2018-05-07 Thread svn-role
Author: svn-role Date: Tue May 8 04:00:08 2018 New Revision: 1831143 URL: http://svn.apache.org/viewvc?rev=1831143=rev Log: Merge r1828613 from trunk: * r1828613 Fix a JavaHL local refs capacity warning when unparsing externals. Justification: Prevents overflow of the JNI local

svn commit: r1831142 - in /subversion/branches/1.10.x: ./ STATUS subversion/svn/help-cmd.c tools/client-side/svn-mergeinfo-normalizer/help-cmd.c

2018-05-07 Thread svn-role
Author: svn-role Date: Tue May 8 04:00:06 2018 New Revision: 1831142 URL: http://svn.apache.org/viewvc?rev=1831142=rev Log: Merge the r1829012 group from trunk: * r1829012, r1829015 Correctly claim to offer Gnome Keyring support with libsecret Justification: New feature, would cause

svn commit: r1829327 - /subversion/branches/1.8.x-sqlite-compatibility-docu/

2018-04-16 Thread svn-role
Author: svn-role Date: Tue Apr 17 04:00:27 2018 New Revision: 1829327 URL: http://svn.apache.org/viewvc?rev=1829327=rev Log: Remove the '1.8.x-sqlite-compatibility-docu' branch, merged in r1829326. Removed: subversion/branches/1.8.x-sqlite-compatibility-docu/

svn commit: r1829326 - in /subversion/branches/1.8.x: ./ INSTALL STATUS

2018-04-16 Thread svn-role
Author: svn-role Date: Tue Apr 17 04:00:12 2018 New Revision: 1829326 URL: http://svn.apache.org/viewvc?rev=1829326=rev Log: Merge the 1.8.x-sqlite-compatibility-docu branch: * r1828782 Document build issues with certain SQLite versions using Visual Studio 2005+. Justification

svn commit: r1828043 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_fs_fs/cached_data.c subversion/tests/cmdline/commit_tests.py

2018-03-29 Thread svn-role
Author: svn-role Date: Fri Mar 30 04:00:07 2018 New Revision: 1828043 URL: http://svn.apache.org/viewvc?rev=1828043=rev Log: Merge the r1826720 group from trunk: * r1826720, r1826721, r1827191, r1827574 Regression test and FSFS checksum test, part of issue 4722. Justification: Keeps

svn commit: r1827875 - in /subversion/branches/1.10.x: ./ STATUS subversion/include/svn_ra_svn.h

2018-03-27 Thread svn-role
Author: svn-role Date: Wed Mar 28 04:00:06 2018 New Revision: 1827875 URL: http://svn.apache.org/viewvc?rev=1827875=rev Log: Merge the r1825979 group from trunk: * r1825979, r1827670 Minor clarification to docstring. Justification: Trivial documentation fix. Votes: +1

svn commit: r1827798 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_fs_fs/cached_data.c subversion/libsvn_fs_fs/temp_serializer.h subversion/tests/cmdline/svnadmin_tests.py

2018-03-26 Thread svn-role
Author: svn-role Date: Tue Mar 27 04:00:07 2018 New Revision: 1827798 URL: http://svn.apache.org/viewvc?rev=1827798=rev Log: Merge the r1826811 group from trunk: * r1826811, r1826814, r1826877, r1826907, r1826971 Fix issue 4725: FSFS block-read mode doesn't work. Justification: Block

svn commit: r1827688 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_fs_fs/cached_data.c

2018-03-24 Thread svn-role
Author: svn-role Date: Sun Mar 25 04:00:08 2018 New Revision: 1827688 URL: http://svn.apache.org/viewvc?rev=1827688=rev Log: Merge the 1.9.x-issue4722 branch: * r1826272 Fix issue 4722: commits that fail when a file DELTA is a multiple of 16K. Justification: Commits fail with a false

svn commit: r1827689 - /subversion/branches/1.9.x-issue4722/

2018-03-24 Thread svn-role
Author: svn-role Date: Sun Mar 25 04:00:23 2018 New Revision: 1827689 URL: http://svn.apache.org/viewvc?rev=1827689=rev Log: Remove the '1.9.x-issue4722' branch, merged in r1827688. Removed: subversion/branches/1.9.x-issue4722/

svn commit: r1827691 - in /subversion/branches/1.10.x: ./ STATUS subversion/tests/cmdline/davautocheck.sh subversion/tests/cmdline/svnserveautocheck.sh

2018-03-24 Thread svn-role
Author: svn-role Date: Sun Mar 25 04:00:30 2018 New Revision: 1827691 URL: http://svn.apache.org/viewvc?rev=1827691=rev Log: Merge the r1827105 group from trunk: * r1827105, r1827114 Add testsuite support for testing FSFS with block-read enabled. Justification: Allows testing

svn commit: r1827690 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_client/info.c

2018-03-24 Thread svn-role
Author: svn-role Date: Sun Mar 25 04:00:27 2018 New Revision: 1827690 URL: http://svn.apache.org/viewvc?rev=1827690=rev Log: Merge r1823327 from trunk: * r1823327 Performance: Make the 'info' command fast on old repository revisions. Justification: Performance was bad. Votes

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: r1826169 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_subr/lz4/lz4.c

2018-03-07 Thread svn-role
Author: svn-role Date: Thu Mar 8 04:00:05 2018 New Revision: 1826169 URL: http://svn.apache.org/viewvc?rev=1826169=rev Log: Merge r1825306 from trunk: * r1825306 Silence OSX ranlib warnings about object files with no symbols when linking with an external LZ4 library. Justification

svn commit: r1826064 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_subr/sysinfo.c

2018-03-06 Thread svn-role
Author: svn-role Date: Wed Mar 7 04:00:08 2018 New Revision: 1826064 URL: http://svn.apache.org/viewvc?rev=1826064=rev Log: Merge r1825721 from trunk: * r1825721 Convert macOS versions 10.13.x to release name "High Sierra". Justication: Cosmetic correctness of 'svn

svn commit: r1825795 - in /subversion/branches/1.10.x: ./ STATUS subversion/mod_authz_svn/mod_authz_svn.c

2018-03-03 Thread svn-role
Author: svn-role Date: Sun Mar 4 04:00:06 2018 New Revision: 1825795 URL: http://svn.apache.org/viewvc?rev=1825795=rev Log: Merge the r1825736 group from trunk: * r1825736, r1825778 Fix a memory usage problem in mod_authz_svn. Justifiation: Server uses too much memory if authz

svn commit: r1825285 - in /subversion/branches/1.10.x: ./ STATUS subversion/svn/svn.c

2018-02-24 Thread svn-role
Author: svn-role Date: Sun Feb 25 04:00:05 2018 New Revision: 1825285 URL: http://svn.apache.org/viewvc?rev=1825285=rev Log: Merge r1825045 from trunk: * r1825045 Shelving: correct the help text for shelving v1 storage location. Justification: The help incorrectly specified the names

svn commit: r1825286 - in /subversion/branches/1.10.x: ./ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/

2018-02-24 Thread svn-role
Author: svn-role Date: Sun Feb 25 04:00:09 2018 New Revision: 1825286 URL: http://svn.apache.org/viewvc?rev=1825286=rev Log: Merge r1825215 from trunk: * r1825215 Expose the functionality of the new-in-1.10 svn_repos_load_fs6 in JavaHL. Justification: It makes sense to expose all new

svn commit: r1825287 - in /subversion/branches/1.10.x: ./ STATUS subversion/bindings/swig/perl/native/Core.pm

2018-02-24 Thread svn-role
Author: svn-role Date: Sun Feb 25 04:00:12 2018 New Revision: 1825287 URL: http://svn.apache.org/viewvc?rev=1825287=rev Log: Merge the r1825024 group from trunk: * r1825024, r1825266 Fix "can't break line" warning in generated man page. Justification: Small documentation fi

svn commit: r1824407 - in /subversion/branches/1.10.x: ./ Makefile.in STATUS

2018-02-15 Thread svn-role
Author: svn-role Date: Fri Feb 16 04:00:12 2018 New Revision: 1824407 URL: http://svn.apache.org/viewvc?rev=1824407=rev Log: Merge r1823791 from trunk: * r1823791 Ensure that libsvn_swig_perl is built before Makefile.PL. Justification: Fixes the Perl bindings build in parallel mode

svn commit: r1824405 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_subr/object_pool.c

2018-02-15 Thread svn-role
Author: svn-role Date: Fri Feb 16 04:00:05 2018 New Revision: 1824405 URL: http://svn.apache.org/viewvc?rev=1824405=rev Log: Merge r1818584 from trunk: * r1818584 Fix crash when exiting 'svnserve --config-file'. Justification: This is a user-reported crash. The underlying container

svn commit: r1824406 - in /subversion/branches/1.10.x: ./ STATUS build/PrintPath build/ac-macros/find_apr.m4 build/ac-macros/find_apu.m4

2018-02-15 Thread svn-role
Author: svn-role Date: Fri Feb 16 04:00:09 2018 New Revision: 1824406 URL: http://svn.apache.org/viewvc?rev=1824406=rev Log: Merge r1824033 from trunk: * r1824033 Update our copies of APR utility files to those in our recommended APR version. Justification: The release build

svn commit: r1824408 - in /subversion/branches/1.10.x: ./ STATUS build/ac-macros/swig.m4

2018-02-15 Thread svn-role
Author: svn-role Date: Fri Feb 16 04:00:14 2018 New Revision: 1824408 URL: http://svn.apache.org/viewvc?rev=1824408=rev Log: Merge r1823211 from trunk: * r1823211 Filter standard library directories from SWIG_PL_LINK. Justification: Consistency with how this is done for other swig

svn commit: r1824194 - in /subversion/branches/1.10.x: ./ Makefile.in STATUS build/run_tests.py subversion/tests/cmdline/svntest/main.py

2018-02-13 Thread svn-role
Author: svn-role Date: Wed Feb 14 04:00:06 2018 New Revision: 1824194 URL: http://svn.apache.org/viewvc?rev=1824194=rev Log: Merge the r1822587 group from trunk: * r1822587, r1822591 Make it possible to run 'make check' with installed binaries. Justification: Cuts 'make check' run

svn commit: r1823810 - in /subversion/branches/1.10.x: ./ STATUS subversion/tests/cmdline/davautocheck.sh

2018-02-10 Thread svn-role
Author: svn-role Date: Sun Feb 11 04:00:18 2018 New Revision: 1823810 URL: http://svn.apache.org/viewvc?rev=1823810=rev Log: Merge r1820627 from trunk: * r1820627 davautocheck.sh: Support a --lldb option alongside --gdb. Justification: Will be helpful in debugging backports. Votes

svn commit: r1823806 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_subr/x509parse.c subversion/tests/libsvn_subr/x509-test.c

2018-02-10 Thread svn-role
Author: svn-role Date: Sun Feb 11 04:00:08 2018 New Revision: 1823806 URL: http://svn.apache.org/viewvc?rev=1823806=rev Log: Merge r1822996 from trunk: * r1822996 Fix x509 parser to handle RSASSA-PSS certificates. Justification: JavaHL needs this to handle failure to verify

svn commit: r1823808 - in /subversion/branches/1.10.x: ./ STATUS subversion/svn/shelve-cmd.c

2018-02-10 Thread svn-role
Author: svn-role Date: Sun Feb 11 04:00:13 2018 New Revision: 1823808 URL: http://svn.apache.org/viewvc?rev=1823808=rev Log: Merge r1820044 from trunk: * r1820044 Make 'svn shelves' diffstat output show WC-relative paths. Votes: +1: julianfoad, jamessan, stsp Modified

svn commit: r1823809 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_client/info.c

2018-02-10 Thread svn-role
Author: svn-role Date: Sun Feb 11 04:00:15 2018 New Revision: 1823809 URL: http://svn.apache.org/viewvc?rev=1823809=rev Log: Merge r1823327 from trunk: * r1823327 Performance: Make the 'info' command fast on old repository revisions. Justification: Performance was bad. Votes

svn commit: r1823807 - in /subversion/branches/1.10.x: ./ STATUS subversion/mod_dav_svn/dav_svn.h subversion/mod_dav_svn/mod_dav_svn.c subversion/mod_dav_svn/version.c

2018-02-10 Thread svn-role
Author: svn-role Date: Sun Feb 11 04:00:11 2018 New Revision: 1823807 URL: http://svn.apache.org/viewvc?rev=1823807=rev Log: Merge r1820778 from trunk: * r1820778 Make mod_dav_svn report commit capabilities based on SVNMasterVersion. Justification: Allows 1.10 write-through proxy

svn commit: r1823805 - in /subversion/branches/1.9.x: ./ STATUS subversion/bindings/swig/include/svn_types.swg

2018-02-10 Thread svn-role
Author: svn-role Date: Sun Feb 11 04:00:05 2018 New Revision: 1823805 URL: http://svn.apache.org/viewvc?rev=1823805=rev Log: Merge r1811786 from trunk: * r1811786 When svn_md5_digest_to_cstring() returns NULL, pass an empty string to rb_str_new2(). Justification: Prevent a crash

svn commit: r1823729 - /subversion/branches/1.10.x-issue4686/

2018-02-09 Thread svn-role
Author: svn-role Date: Sat Feb 10 04:00:22 2018 New Revision: 1823729 URL: http://svn.apache.org/viewvc?rev=1823729=rev Log: Remove the '1.10.x-issue4686' branch, merged in r1823728. Removed: subversion/branches/1.10.x-issue4686/

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

2018-02-09 Thread svn-role
Author: svn-role Date: Sat Feb 10 04:00:06 2018 New Revision: 1823728 URL: http://svn.apache.org/viewvc?rev=1823728=rev Log: Merge the 1.10.x-issue4686 branch: * r1823202,r1823203 Fix issue #4686 "Unable to parse reversed revision range '19634-19631'" Justification: Asserti

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

2018-01-31 Thread svn-role
Author: svn-role Date: Thu Feb 1 04:00:06 2018 New Revision: 1822845 URL: http://svn.apache.org/viewvc?rev=1822845=rev Log: Merge r1822401 from trunk: * r1822401 Fix 'dereference pointer to the wrong object' crash in conflict resolver. Votes: +1: stsp, rhuijben, jamessan Modified

svn commit: r1822731 - in /subversion/branches/1.10.x: ./ STATUS subversion/svn/shelve-cmd.c subversion/svn/svn.c tools/client-side/bash_completion

2018-01-30 Thread svn-role
Author: svn-role Date: Wed Jan 31 04:00:06 2018 New Revision: 1822731 URL: http://svn.apache.org/viewvc?rev=1822731=rev Log: Merge the r1820046 group from trunk: * r1820046,r1820047 Let 'svn shelves' accept '-q' for consistency with 'svn shelve --list -q'. Votes: +1: julianfoad

svn commit: r1822734 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_client/conflicts.c

2018-01-30 Thread svn-role
Author: svn-role Date: Wed Jan 31 04:00:14 2018 New Revision: 1822734 URL: http://svn.apache.org/viewvc?rev=1822734=rev Log: Merge r1822401 from trunk: * r1822401 Fix 'dereference pointer to the wrong object' crash in conflict resolver. Votes: +1: stsp, rhuijben, jamessan Veto

svn commit: r1822732 - in /subversion/branches/1.10.x: ./ STATUS subversion/include/svn_client.h subversion/libsvn_client/shelve.c

2018-01-30 Thread svn-role
Author: svn-role Date: Wed Jan 31 04:00:09 2018 New Revision: 1822732 URL: http://svn.apache.org/viewvc?rev=1822732=rev Log: Merge r1821621 from trunk: * r1821621 Remove lower level shelving functions from (experimental) public API. Votes: +1: julianfoad, rhuijben, jamessan Modified

svn commit: r1822733 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_client/shelve.c

2018-01-30 Thread svn-role
Author: svn-role Date: Wed Jan 31 04:00:11 2018 New Revision: 1822733 URL: http://svn.apache.org/viewvc?rev=1822733=rev Log: Merge r1821678 from trunk: * r1821678 Encode the shelf name to ensure a valid filename for the patch file. Votes: +1: julianfoad, rhuijben, jamessan Modified

svn commit: r1822604 - in /subversion/branches/1.10.x: ./ STATUS subversion/bindings/javahl/native/Prompter.cpp tools/examples/ExampleAuthn.java

2018-01-29 Thread svn-role
Author: svn-role Date: Tue Jan 30 04:00:05 2018 New Revision: 1822604 URL: http://svn.apache.org/viewvc?rev=1822604=rev Log: Merge r1820718 from trunk: * r1820718 Fix JavaHL SSL server trust prompting to allow accepting temporarily. Justification: Cannot accept temporarily without

svn commit: r1821588 - in /subversion/branches/1.10.x: ./ subversion/include/ subversion/include/private/ subversion/libsvn_subr/ subversion/svn/ subversion/svnbench/ subversion/svnmucc/ subversion/sv

2018-01-18 Thread svn-role
Author: svn-role Date: Fri Jan 19 04:00:11 2018 New Revision: 1821588 URL: http://svn.apache.org/viewvc?rev=1821588=rev Log: Merge r1821224 from trunk: * r1821224 Rename and move the new-for-1.10 function 'svn_io_stdin_readline()'. Justification: This function is not a good fit

svn commit: r1821587 - in /subversion/branches/1.10.x: ./ subversion/include/

2018-01-18 Thread svn-role
Author: svn-role Date: Fri Jan 19 04:00:07 2018 New Revision: 1821587 URL: http://svn.apache.org/viewvc?rev=1821587=rev Log: Merge r1821183 from trunk: * r1821183 Tweaks to doc strings and Doxygen mark-up of 1.10 API changes. Votes: +1: julianfoad, danielsh Modified: subversion

svn commit: r1820620 - in /subversion/branches/1.9.x: ./ STATUS subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c

2018-01-08 Thread svn-role
Author: svn-role Date: Tue Jan 9 04:00:05 2018 New Revision: 1820620 URL: http://svn.apache.org/viewvc?rev=1820620=rev Log: Merge r1820518 from trunk: * r1820518 swig-py: Support raw binary file-like objects for readable svn_stream_t* parameters. [D:bindings] Justification: Allow

svn commit: r1820525 - in /subversion/branches/1.10.x: ./ STATUS subversion/tests/cmdline/svntest/main.py

2018-01-07 Thread svn-role
Author: svn-role Date: Mon Jan 8 04:00:27 2018 New Revision: 1820525 URL: http://svn.apache.org/viewvc?rev=1820525=rev Log: Merge the r1818577 group from trunk: * r1818577, r1819146 Fix test suite handling of pre-cooked repositories Justification: We want our test suite to pass

svn commit: r1820524 - /subversion/branches/1.9.x-r1808955/

2018-01-07 Thread svn-role
Author: svn-role Date: Mon Jan 8 04:00:23 2018 New Revision: 1820524 URL: http://svn.apache.org/viewvc?rev=1820524=rev Log: Remove the '1.9.x-r1808955' branch, merged in r1820523. Removed: subversion/branches/1.9.x-r1808955/

svn commit: r1820523 - in /subversion/branches/1.9.x: ./ STATUS subversion/tests/cmdline/davautocheck.sh

2018-01-07 Thread svn-role
Author: svn-role Date: Mon Jan 8 04:00:07 2018 New Revision: 1820523 URL: http://svn.apache.org/viewvc?rev=1820523=rev Log: Merge the 1.9.x-r1808955 branch: * r1808955, r1808956, r1809558, r1809564 Transmit the run-time HTTPD version to the DAV test driver. Justification: Prevents

svn commit: r1820249 - in /subversion/branches/1.10.x: ./ notes/api-errata/1.10/ subversion/bindings/swig/perl/native/t/ subversion/include/ subversion/libsvn_ra_local/ subversion/libsvn_ra_serf/ subv

2018-01-04 Thread svn-role
Author: svn-role Date: Fri Jan 5 04:00:12 2018 New Revision: 1820249 URL: http://svn.apache.org/viewvc?rev=1820249=rev Log: Merge the r1818578 group from trunk: * r1818578, r1819037, r1819049, r1819052 Fix svn_dirent_t.size API inconsistency Justification: Our APIs should behave

svn commit: r1820248 - in /subversion/branches/1.10.x: ./ STATUS build/generator/swig/__init__.py build/generator/swig/checkout_swig_header.py build/generator/swig/external_runtime.py build/generator/

2018-01-04 Thread svn-role
Author: svn-role Date: Fri Jan 5 04:00:09 2018 New Revision: 1820248 URL: http://svn.apache.org/viewvc?rev=1820248=rev Log: Merge the r1819556 group from trunk: * r1819556, r1819557 Improve external command invocation in the swig parts of the build system. Both gen-make.py and 'make swig

svn commit: r1820252 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_client/shelve.c subversion/tests/cmdline/shelve_tests.py

2018-01-04 Thread svn-role
Author: svn-role Date: Fri Jan 5 04:00:20 2018 New Revision: 1820252 URL: http://svn.apache.org/viewvc?rev=1820252=rev Log: Merge r1819804 from trunk: * r1819804 Fix 'shelve' when the current working directory is not the WC root. Justification: Makes shelve follow typical UI of svn

svn commit: r1820247 - in /subversion/branches/1.10.x: ./ STATUS build/generator/gen_base.py

2018-01-04 Thread svn-role
Author: svn-role Date: Fri Jan 5 04:00:06 2018 New Revision: 1820247 URL: http://svn.apache.org/viewvc?rev=1820247=rev Log: Merge r1819444 from trunk: * r1819444 autogen.sh: Correct the symbolic error name generation logic under Python 3. Justification: Fixes a false positive

svn commit: r1820251 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_subr/object_pool.c

2018-01-04 Thread svn-role
Author: svn-role Date: Fri Jan 5 04:00:18 2018 New Revision: 1820251 URL: http://svn.apache.org/viewvc?rev=1820251=rev Log: Merge r1818584 from trunk: * r1818584 Fix crash when exiting 'svnserve --config-file'. Justification: This is a user-reported crash. The underlying container

svn commit: r1820250 - in /subversion/branches/1.10.x: ./ STATUS subversion/svn/list-cmd.c subversion/svn/svn.c subversion/tests/cmdline/basic_tests.py

2018-01-04 Thread svn-role
Author: svn-role Date: Fri Jan 5 04:00:16 2018 New Revision: 1820250 URL: http://svn.apache.org/viewvc?rev=1820250=rev Log: Merge the r1819036 group from trunk: * r1819036, r1819043 Switch 'svn ls --search' on Windows to sub-string matching. Justification: The new feature was mostly

svn commit: r1820031 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_wc/wc.h

2018-01-03 Thread svn-role
Author: svn-role Date: Thu Jan 4 04:00:05 2018 New Revision: 1820031 URL: http://svn.apache.org/viewvc?rev=1820031=rev Log: Merge r1819911 from trunk: * r1819911 Document the WC format used by Subversion 1.10.x. No functional change. Justification: It makes sense to have the correct

svn commit: r1819922 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_subr/config_file.c subversion/tests/libsvn_subr/config-test.c subversion/tests/libsvn_subr/config-test.cfg

2018-01-02 Thread svn-role
Author: svn-role Date: Wed Jan 3 04:00:06 2018 New Revision: 1819922 URL: http://svn.apache.org/viewvc?rev=1819922=rev Log: Merge r1819603 from trunk: * r1819603 Fix a bug in the config parser that caused it to strip leading characters from value continuation lines. Justification

svn commit: r1819230 - in /subversion/branches/1.10.x: ./ subversion/include/ subversion/libsvn_subr/ subversion/svn/ subversion/svnbench/ subversion/svnmucc/ subversion/svnrdump/ subversion/tests/cmd

2017-12-24 Thread svn-role
Author: svn-role Date: Mon Dec 25 04:00:12 2017 New Revision: 1819230 URL: http://svn.apache.org/viewvc?rev=1819230=rev Log: Merge r1819093 from trunk: * r1819093 Introduce a new global option: --password-from-stdin Justification: Small, useful, self-contained feature written

svn commit: r1819229 - in /subversion/branches/1.10.x: ./ INSTALL STATUS build/ac-macros/lz4.m4 build/ac-macros/utf8proc.m4 subversion/include/private/svn_subr_private.h subversion/libsvn_subr/compres

2017-12-24 Thread svn-role
Author: svn-role Date: Mon Dec 25 04:00:08 2017 New Revision: 1819229 URL: http://svn.apache.org/viewvc?rev=1819229=rev Log: Merge the r1818651 group from trunk: * r1818651, r1818662, r1818727, r1818801, r1818803, r1818807, r1818868, r1818871, r1819162 Improve lz4,utf8proc configure

svn commit: r1819200 - in /subversion/branches/1.10.x: ./ STATUS subversion/svn/help-cmd.c

2017-12-23 Thread svn-role
Author: svn-role Date: Sun Dec 24 04:00:08 2017 New Revision: 1819200 URL: http://svn.apache.org/viewvc?rev=1819200=rev Log: Merge r1817856 from trunk: * r1817856 Fix segfault when no home directory is available. Justification: API violation: svn_config_get_user_config() may return

svn commit: r1819199 - in /subversion/branches/1.9.x: ./ STATUS subversion/svn/help-cmd.c

2017-12-23 Thread svn-role
Author: svn-role Date: Sun Dec 24 04:00:05 2017 New Revision: 1819199 URL: http://svn.apache.org/viewvc?rev=1819199=rev Log: Merge r1817856 from trunk: * r1817856 Fix segfault when no home directory is available. Justification: API violation: svn_config_get_user_config() may return

svn commit: r1816208 - /subversion/branches/1.8.x-issue4707/

2017-11-23 Thread svn-role
Author: svn-role Date: Fri Nov 24 04:00:27 2017 New Revision: 1816208 URL: http://svn.apache.org/viewvc?rev=1816208=rev Log: Remove the '1.8.x-issue4707' branch, merged in r1816207. Removed: subversion/branches/1.8.x-issue4707/

svn commit: r1816207 - in /subversion/branches/1.8.x: ./ STATUS subversion/ subversion/svnrdump/dump_editor.c

2017-11-23 Thread svn-role
Author: svn-role Date: Fri Nov 24 04:00:12 2017 New Revision: 1816207 URL: http://svn.apache.org/viewvc?rev=1816207=rev Log: Merge the 1.8.x-issue4707 branch: * r1816069,1816106 Issue #4707: svnrdump dump: 2GB limit on content-length header. Justification: Large file support

svn commit: r1814249 - /subversion/branches/1.9.x-r1795116/

2017-11-03 Thread svn-role
Author: svn-role Date: Sat Nov 4 04:00:31 2017 New Revision: 1814249 URL: http://svn.apache.org/viewvc?rev=1814249=rev Log: Remove the '1.9.x-r1795116' branch, merged in r1814248. Removed: subversion/branches/1.9.x-r1795116/

svn commit: r1814248 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_fs_fs/tree.c subversion/libsvn_fs_x/ subversion/libsvn_fs_x/tree.c subversion/tests/libsvn_fs/fs-test.c

2017-11-03 Thread svn-role
Author: svn-role Date: Sat Nov 4 04:00:15 2017 New Revision: 1814248 URL: http://svn.apache.org/viewvc?rev=1814248=rev Log: Merge the 1.9.x-r1795116 branch: * r1795116, r1796167 Fix 'svn up' after a directories replaced a file (issue #4677). Justification: User-reported error

svn commit: r1803756 - /subversion/branches/1.9.x-r1802316/

2017-08-01 Thread svn-role
Author: svn-role Date: Wed Aug 2 04:00:41 2017 New Revision: 1803756 URL: http://svn.apache.org/viewvc?rev=1803756=rev Log: Remove the '1.9.x-r1802316' branch, merged in r1803755. Removed: subversion/branches/1.9.x-r1802316/

svn commit: r1803755 - in /subversion/branches/1.9.x: ./ STATUS subversion/include/svn_client.h subversion/libsvn_client/export.c subversion/tests/cmdline/export_tests.py

2017-08-01 Thread svn-role
Author: svn-role Date: Wed Aug 2 04:00:25 2017 New Revision: 1803755 URL: http://svn.apache.org/viewvc?rev=1803755=rev Log: Merge the 1.9.x-r1802316 branch: * r1802080, r1802316 Fix SEGV for 'svn export -rN WC' with relative externals. Justification: Client SEGV. Branch

svn commit: r1803754 - in /subversion/branches/1.9.x: ./ STATUS subversion/svnadmin/svnadmin.c

2017-08-01 Thread svn-role
Author: svn-role Date: Wed Aug 2 04:00:07 2017 New Revision: 1803754 URL: http://svn.apache.org/viewvc?rev=1803754=rev Log: Merge r1796420 from trunk: * r1796420 svnadmin: Canonicalize LOCK_PATH arguments. Justification: API violation; errors on valid input. Votes: +1

svn commit: r1796970 - in /subversion/branches/1.9.x: ./ STATUS subversion/bindings/javahl/native/RemoteSession.cpp

2017-05-30 Thread svn-role
Author: svn-role Date: Wed May 31 04:00:06 2017 New Revision: 1796970 URL: http://svn.apache.org/viewvc?rev=1796970=rev Log: Merge the r1667738 group from trunk: * r1667738, r1796720 Properly follow redirects in JavaHL's RA connection. Justification: Makes JavaHL API conform

svn commit: r1796725 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_fs_fs/transaction.c

2017-05-29 Thread svn-role
Author: svn-role Date: Tue May 30 04:00:07 2017 New Revision: 1796725 URL: http://svn.apache.org/viewvc?rev=1796725=rev Log: Merge r1796158 from trunk: * r1796158 Fix FSFS f7 metadata recording issue caused by the r1785053 backport. Justification: An obvious fix (one caller got

svn commit: r1796471 - /subversion/branches/1.9.x-fix-fsfs/

2017-05-27 Thread svn-role
Author: svn-role Date: Sun May 28 04:00:23 2017 New Revision: 1796471 URL: http://svn.apache.org/viewvc?rev=1796471=rev Log: Remove the '1.9.x-fix-fsfs' branch, merged in r1796470. Removed: subversion/branches/1.9.x-fix-fsfs/

svn commit: r1796470 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_fs_fs/transaction.c

2017-05-27 Thread svn-role
Author: svn-role Date: Sun May 28 04:00:08 2017 New Revision: 1796470 URL: http://svn.apache.org/viewvc?rev=1796470=rev Log: Merge the 1.9.x-fix-fsfs branch: * r1796143 Fix the FSFS breakage caused by the latest SHA-1-related merges. Justification: FSFS is basically broken (~400

svn commit: r1795994 - /subversion/branches/1.9.x-strict-rep-sharing/

2017-05-23 Thread svn-role
Author: svn-role Date: Wed May 24 04:00:26 2017 New Revision: 1795994 URL: http://svn.apache.org/viewvc?rev=1795994=rev Log: Remove the '1.9.x-strict-rep-sharing' branch, merged in r1795993. Removed: subversion/branches/1.9.x-strict-rep-sharing/

svn commit: r1795993 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_fs_fs/cached_data.c subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/transaction.c subversion/libsvn_fs_x

2017-05-23 Thread svn-role
Author: svn-role Date: Wed May 24 04:00:11 2017 New Revision: 1795993 URL: http://svn.apache.org/viewvc?rev=1795993=rev Log: Merge the 1.9.x-strict-rep-sharing branch: * r1785737, r1785738, r1785734, r1786447, r1785754, r1786445, r1786446, r1786515, r1794530, r1794536, r1794611 Make FSFS

svn commit: r1791565 - in /subversion/branches/1.9.x: ./ STATUS build/run_tests.py

2017-04-15 Thread svn-role
Author: svn-role Date: Sun Apr 16 04:00:15 2017 New Revision: 1791565 URL: http://svn.apache.org/viewvc?rev=1791565=rev Log: Merge r1706432 from trunk: * r1706432 Fix tests on Windows when passing --bin to win_tests.py. Justification: Tests should simply work. Notes: Fixes a bad

svn commit: r1791563 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_repos/dump.c

2017-04-15 Thread svn-role
Author: svn-role Date: Sun Apr 16 04:00:10 2017 New Revision: 1791563 URL: http://svn.apache.org/viewvc?rev=1791563=rev Log: Merge r1781507 from trunk: * r1781507 Fix a NULL deref in libsvn_repos which makes svndumpfilter crash. Justification: Should not crash. User complained

svn commit: r1791564 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_fs_fs/rep-cache.c

2017-04-15 Thread svn-role
Author: svn-role Date: Sun Apr 16 04:00:12 2017 New Revision: 1791564 URL: http://svn.apache.org/viewvc?rev=1791564=rev Log: Merge r1781655 from trunk: * r1781655 Improve error message upon failure to open rep-cache. Justification: The current message lacks sufficient detail

svn commit: r1787897 - in /subversion/branches/1.9.x: ./ STATUS subversion/svnadmin/svnadmin.c

2017-03-20 Thread svn-role
Author: svn-role Date: Tue Mar 21 04:00:08 2017 New Revision: 1787897 URL: http://svn.apache.org/viewvc?rev=1787897=rev Log: Merge r1774109 from trunk: * r1774109 Document the purpose of 'svnadmin freeze' more clearly. Justification: Not very important, nice to have documentation fix

svn commit: r1770614 - /subversion/branches/1.8.x-issue4658/

2016-11-20 Thread svn-role
Author: svn-role Date: Mon Nov 21 04:01:46 2016 New Revision: 1770614 URL: http://svn.apache.org/viewvc?rev=1770614=rev Log: Remove the '1.8.x-issue4658' branch, merged in r1770613. Removed: subversion/branches/1.8.x-issue4658/

svn commit: r1770611 - in /subversion/branches/1.8.x: ./ STATUS subversion/ subversion/libsvn_wc/update_editor.c subversion/tests/cmdline/authz_tests.py

2016-11-20 Thread svn-role
Author: svn-role Date: Mon Nov 21 04:01:05 2016 New Revision: 1770611 URL: http://svn.apache.org/viewvc?rev=1770611=rev Log: Merge the 1.8.x-r1724448 branch: * r1724448, r1770355 Fix handling of newly secured subdirectories in a working copy Justification: Regression against <= 1.

svn commit: r1770612 - /subversion/branches/1.8.x-r1724448/

2016-11-20 Thread svn-role
Author: svn-role Date: Mon Nov 21 04:01:21 2016 New Revision: 1770612 URL: http://svn.apache.org/viewvc?rev=1770612=rev Log: Remove the '1.8.x-r1724448' branch, merged in r1770611. Removed: subversion/branches/1.8.x-r1724448/

svn commit: r1770609 - in /subversion/branches/1.8.x: ./ STATUS subversion/ subversion/libsvn_subr/cache-membuffer.c subversion/libsvn_subr/eol.c subversion/libsvn_subr/utf_validate.c

2016-11-20 Thread svn-role
Author: svn-role Date: Mon Nov 21 04:00:40 2016 New Revision: 1770609 URL: http://svn.apache.org/viewvc?rev=1770609=rev Log: Merge the 1.8.x-portability branch: * r1722860, r1722879, r1722887 Memory access portability issues. Justification: Not complying to the C standard is bad

svn commit: r1770613 - in /subversion/branches/1.8.x: ./ STATUS subversion/ subversion/libsvn_fs_fs/fs_fs.c subversion/tests/libsvn_fs_fs/fs-pack-test.c

2016-11-20 Thread svn-role
Author: svn-role Date: Mon Nov 21 04:01:31 2016 New Revision: 1770613 URL: http://svn.apache.org/viewvc?rev=1770613=rev Log: Merge the 1.8.x-issue4658 branch: * r1766352, r1766590 Fix issue #4658: Can't reconstruct fulltext from DELTA against PLAIN in FSFS Justification: Prevents

svn commit: r1770608 - in /subversion/branches/1.8.x: ./ STATUS subversion/ subversion/libsvn_ra_serf/inherited_props.c subversion/libsvn_ra_svn/client.c

2016-11-20 Thread svn-role
Author: svn-role Date: Mon Nov 21 04:00:31 2016 New Revision: 1770608 URL: http://svn.apache.org/viewvc?rev=1770608=rev Log: Merge the r1717875 group from trunk: * r1717875, r1717878 Make inherited property api consistent over all ra layers Justification: Our ra implementations

svn commit: r1770610 - /subversion/branches/1.8.x-portability/

2016-11-20 Thread svn-role
Author: svn-role Date: Mon Nov 21 04:00:56 2016 New Revision: 1770610 URL: http://svn.apache.org/viewvc?rev=1770610=rev Log: Remove the '1.8.x-portability' branch, merged in r1770609. Removed: subversion/branches/1.8.x-portability/

svn commit: r1770606 - in /subversion/branches/1.8.x: ./ STATUS subversion/ subversion/libsvn_ra_serf/commit.c subversion/tests/cmdline/lock_tests.py

2016-11-20 Thread svn-role
Author: svn-role Date: Mon Nov 21 04:00:12 2016 New Revision: 1770606 URL: http://svn.apache.org/viewvc?rev=1770606=rev Log: Merge the 1.8.x-issue4557 branch: * r1663500 Fix issue #4557, "ra_serf fails to delete directory containing many files" Justification: Regression

svn commit: r1770607 - /subversion/branches/1.8.x-issue4557/

2016-11-20 Thread svn-role
Author: svn-role Date: Mon Nov 21 04:00:27 2016 New Revision: 1770607 URL: http://svn.apache.org/viewvc?rev=1770607=rev Log: Remove the '1.8.x-issue4557' branch, merged in r1770606. Removed: subversion/branches/1.8.x-issue4557/

svn commit: r1770462 - in /subversion/branches/1.9.x: ./ STATUS build/ac-macros/zlib.m4

2016-11-18 Thread svn-role
Author: svn-role Date: Sat Nov 19 04:00:06 2016 New Revision: 1770462 URL: http://svn.apache.org/viewvc?rev=1770462=rev Log: Merge the r1762338 group from trunk: * r1762338, r1762339, r1769973 Fix issue #4655: add zlib discovery through pkg-config. Justification: Allows building

svn commit: r1770308 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_fs_fs/fs.c subversion/libsvn_fs_fs/pack.c subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/tree.c subversion/tes

2016-11-17 Thread svn-role
Author: svn-role Date: Fri Nov 18 04:01:08 2016 New Revision: 1770308 URL: http://svn.apache.org/viewvc?rev=1770308=rev Log: Merge the 1.9.x-fsfs-pack-fixes@r1770158 branch: * r1759117, r1759122, r1759123, r1759124, 1764676 Fix issue #4657: "Offset too large" error when packing

svn commit: r1770306 - /subversion/branches/1.8.x-r1724448/

2016-11-17 Thread svn-role
Author: svn-role Date: Fri Nov 18 04:00:59 2016 New Revision: 1770306 URL: http://svn.apache.org/viewvc?rev=1770306=rev Log: Remove the '1.8.x-r1724448' branch, merged in r1770305. Removed: subversion/branches/1.8.x-r1724448/

svn commit: r1770303 - in /subversion/branches/1.8.x: ./ STATUS subversion/ subversion/libsvn_client/patch.c

2016-11-17 Thread svn-role
Author: svn-role Date: Fri Nov 18 04:00:34 2016 New Revision: 1770303 URL: http://svn.apache.org/viewvc?rev=1770303=rev Log: Merge r1706783 from trunk: * r1706783 Really pass patch result to svn_client_patch() filter Justification: Without this fix the filter can't determine

svn commit: r1770305 - in /subversion/branches/1.8.x: ./ STATUS subversion/ subversion/libsvn_wc/update_editor.c subversion/tests/cmdline/authz_tests.py

2016-11-17 Thread svn-role
Author: svn-role Date: Fri Nov 18 04:00:44 2016 New Revision: 1770305 URL: http://svn.apache.org/viewvc?rev=1770305=rev Log: Merge the 1.8.x-r1724448 branch: * r1724448 Fix handling of newly secured subdirectories in a working copy Justification: Regression against <= 1.6.x. With

svn commit: r1770307 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_client/merge.c subversion/tests/cmdline/merge_reintegrate_tests.py

2016-11-17 Thread svn-role
Author: svn-role Date: Fri Nov 18 04:01:03 2016 New Revision: 1770307 URL: http://svn.apache.org/viewvc?rev=1770307=rev Log: Merge the r1766699 group from trunk: * r1766699, r1766704, r1766711 Fix a bug where reintegrate merges access a non-existent path and error out. Justification

svn commit: r1770304 - in /subversion/branches/1.8.x: ./ STATUS subversion/ subversion/svnlook/svnlook.c

2016-11-17 Thread svn-role
Author: svn-role Date: Fri Nov 18 04:00:37 2016 New Revision: 1770304 URL: http://svn.apache.org/viewvc?rev=1770304=rev Log: Merge r1711346 from trunk: * r1711346 Properly remove tempfiles in svnlook on diff errors such as EPIPE. Justification: Simple fix makes it far less likely

svn commit: r1770302 - /subversion/branches/1.8.x-r1764851/

2016-11-17 Thread svn-role
Author: svn-role Date: Fri Nov 18 04:00:31 2016 New Revision: 1770302 URL: http://svn.apache.org/viewvc?rev=1770302=rev Log: Remove the '1.8.x-r1764851' branch, merged in r1770301. Removed: subversion/branches/1.8.x-r1764851/

svn commit: r1770299 - in /subversion/branches/1.8.x: ./ STATUS subversion/ subversion/libsvn_subr/gpg_agent.c

2016-11-17 Thread svn-role
Author: svn-role Date: Fri Nov 18 04:00:06 2016 New Revision: 1770299 URL: http://svn.apache.org/viewvc?rev=1770299=rev Log: Merge r1728387 from trunk: * r1728387 Fix issue 4611, gpg-agent and passwords with a percent character. Justification: Some passwords don't work. Votes

svn commit: r1770300 - in /subversion/branches/1.8.x: ./ STATUS configure.ac

2016-11-17 Thread svn-role
Author: svn-role Date: Fri Nov 18 04:00:08 2016 New Revision: 1770300 URL: http://svn.apache.org/viewvc?rev=1770300=rev Log: Merge r1761334 from trunk: * r1761334 Fix issue #4653: SVN_LOCALE_DIR incorrectly interpolated when prefix is not set explicitly. Justification: ./configure

svn commit: r1770301 - in /subversion/branches/1.8.x: ./ STATUS subversion/ subversion/bindings/javahl/native/Prompter.cpp

2016-11-17 Thread svn-role
Author: svn-role Date: Fri Nov 18 04:00:16 2016 New Revision: 1770301 URL: http://svn.apache.org/viewvc?rev=1770301=rev Log: Merge the 1.8.x-r1764851 branch: * r1764851 Fix temporary accepting an SSL server certificate in JavaHL Justification: User reported problem. Simple fix

svn commit: r1770107 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_client/merge.c subversion/tests/cmdline/merge_tree_conflict_tests.py

2016-11-16 Thread svn-role
Author: svn-role Date: Thu Nov 17 04:00:06 2016 New Revision: 1770107 URL: http://svn.apache.org/viewvc?rev=1770107=rev Log: Merge r1734106 from trunk: * r1734106 Fix a bug where the wrong source left revision was recorded in a tree conflict. Justification: Conflict info recorded

svn commit: r1770109 - in /subversion/branches/1.9.x: ./ STATUS subversion/svn/info-cmd.c subversion/tests/cmdline/info_tests.py

2016-11-16 Thread svn-role
Author: svn-role Date: Thu Nov 17 04:00:11 2016 New Revision: 1770109 URL: http://svn.apache.org/viewvc?rev=1770109=rev Log: Merge r1769456 from trunk: * r1769456 Fix issue #4660: svn info --show-item=revision contains trailing whitespaces. Justification: Having trailing whitespaces

svn commit: r1770111 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_wc/update_editor.c subversion/tests/cmdline/authz_tests.py

2016-11-16 Thread svn-role
Author: svn-role Date: Thu Nov 17 04:00:16 2016 New Revision: 1770111 URL: http://svn.apache.org/viewvc?rev=1770111=rev Log: Merge r1724448 from trunk: * r1724448 Fix handling of newly secured subdirectories in a working copy Justification: Regression against <= 1.6.x. With

svn commit: r1770108 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_repos/reporter.c subversion/tests/cmdline/merge_tree_conflict_tests.py

2016-11-16 Thread svn-role
Author: svn-role Date: Thu Nov 17 04:00:09 2016 New Revision: 1770108 URL: http://svn.apache.org/viewvc?rev=1770108=rev Log: Merge r1760570 from trunk: * r1760570 Fix a spurious 'incoming edit' tree conflict with an unmodified file. Justification: Tree conflicts should not be raised

<    1   2   3   4   5   6   7   8   9   10   >