svn commit: r1825709 - /subversion/trunk/subversion/libsvn_client/conflicts.c

Author: stsp Date: Fri Mar 2 11:34:18 2018 New Revision: 1825709 URL: http://svn.apache.org/viewvc?rev=1825709&view=rev Log: Do not offer conflict resolution options for move vs. move conflicts. The resolver does not yet support 'move vs. move' conflict resolution options. However, it erroneous

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

Author: stsp Date: Fri Mar 2 11:37:17 2018 New Revision: 1825710 URL: http://svn.apache.org/viewvc?rev=1825710&view=rev Log: * STATUS: Nominate r1825709. Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/bra

svn commit: r1825711 - in /subversion/trunk/subversion: libsvn_client/conflicts.c tests/libsvn_client/conflicts-test.c

Author: stsp Date: Fri Mar 2 11:48:32 2018 New Revision: 1825711 URL: http://svn.apache.org/viewvc?rev=1825711&view=rev Log: Offer 'move and merge' resolution option for directories only when supported. The function resolve_incoming_move_dir_merge() currently only supports situations where the l

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

Author: stsp Date: Fri Mar 2 11:49:13 2018 New Revision: 1825712 URL: http://svn.apache.org/viewvc?rev=1825712&view=rev Log: * STATUS: Nominate r1825711. Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/bra

svn commit: r1825721 - /subversion/trunk/subversion/libsvn_subr/sysinfo.c

Author: brane Date: Fri Mar 2 13:24:08 2018 New Revision: 1825721 URL: http://svn.apache.org/viewvc?rev=1825721&view=rev Log: * subversion/libsvn_subr/sysinfo.c (release_name_from_version): MacOS 10.13.x is "High Sierra". Modified: subversion/trunk/subversion/libsvn_subr/sysinfo.c Modifi

svn commit: r1825722 - /subversion/trunk/subversion/svn/cl.h

Author: julianfoad Date: Fri Mar 2 13:39:16 2018 New Revision: 1825722 URL: http://svn.apache.org/viewvc?rev=1825722&view=rev Log: * subversion/svn/cl.h (svn_cl__opt_state_t): Remove unused 'list' field. A follow-up to r1825050. Modified: subversion/trunk/subversion/svn/cl.h Modified: sub

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

Author: brane Date: Fri Mar 2 13:47:17 2018 New Revision: 1825723 URL: http://svn.apache.org/viewvc?rev=1825723&view=rev Log: * branches/1.10.x/STATUS: Propose r1825721. Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewv

svn commit: r1825727 - /subversion/trunk/subversion/svn/shelf-cmd.c

Author: julianfoad Date: Fri Mar 2 14:22:04 2018 New Revision: 1825727 URL: http://svn.apache.org/viewvc?rev=1825727&view=rev Log: Shelving: Detect when there is a conflict in unshelving. * subversion/svn/shelf-cmd.c (patch_notify_baton_t, patch_notify): New. (shelf_restore): Intercept patch

svn commit: r1825728 - in /subversion/trunk: subversion/svn/cl.h subversion/svn/shelf-cmd.c subversion/svn/svn.c tools/client-side/bash_completion

Author: julianfoad Date: Fri Mar 2 14:25:25 2018 New Revision: 1825728 URL: http://svn.apache.org/viewvc?rev=1825728&view=rev Log: Shelving: add 'svn unshelve --drop' option. * subversion/svn/cl.h (svn_cl__opt_state_t): Add new 'drop' flag. * subversion/svn/shelf-cmd.c (svn_cl__shelf_unshel

svn commit: r1825730 - in /subversion/trunk/subversion: libsvn_wc/ tests/libsvn_wc/

Author: stsp Date: Fri Mar 2 14:43:20 2018 New Revision: 1825730 URL: http://svn.apache.org/viewvc?rev=1825730&view=rev Log: Record the move target path in a moved-away tree conflict skel. Updates can modify the NODES table in ways which discard local move information about tree conflict victims

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

Author: stsp Date: Fri Mar 2 15:18:36 2018 New Revision: 1825731 URL: http://svn.apache.org/viewvc?rev=1825731&view=rev Log: * STATUS: Vote for r1825721. Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/bra

svn commit: r1825736 - /subversion/trunk/subversion/mod_authz_svn/mod_authz_svn.c

Author: stsp Date: Fri Mar 2 18:30:56 2018 New Revision: 1825736 URL: http://svn.apache.org/viewvc?rev=1825736&view=rev Log: Fix a memory usage problem in mod_authz_svn. The authz config was being repeatadly re-read into the per-connection pool which could drive the server out of memory. * subv

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

Author: stsp Date: Fri Mar 2 18:34:02 2018 New Revision: 1825737 URL: http://svn.apache.org/viewvc?rev=1825737&view=rev Log: * STATUS: Nominate r1825736. Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/bra