svn commit: r29422 - in /dev/subversion: subversion-1.11.0-rc1.tar.bz2.asc subversion-1.11.0-rc1.tar.gz.asc

Author: stefan2 Date: Sun Sep 16 14:04:13 2018 New Revision: 29422 Log: Signing 1.11.0-rc1 for Unix. Modified: dev/subversion/subversion-1.11.0-rc1.tar.bz2.asc dev/subversion/subversion-1.11.0-rc1.tar.gz.asc Modified: dev/subversion/subversion-1.11.0-rc1.tar.bz2.asc =

svn commit: r1840999 - /subversion/branches/1.11.x/STATUS

Author: stsp Date: Sun Sep 16 12:57:19 2018 New Revision: 1840999 URL: http://svn.apache.org/viewvc?rev=1840999&view=rev Log: * STATUS: Nominate r1840990, r1840991, r1840995, r1840997 for 1.11.0. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: ht

svn commit: r1840997 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/conflicts.c svn/conflict-callbacks.c

Author: stsp Date: Sun Sep 16 12:50:34 2018 New Revision: 1840997 URL: http://svn.apache.org/viewvc?rev=1840997&view=rev Log: Improve the semantics of four public API resolver functions. In all cases, the old APIs would raise an assertion failure if an unexpected option was passed. This is bad AP

svn commit: r1840995 - in /subversion/trunk/subversion: libsvn_client/conflicts.c svn/conflict-callbacks.c tests/libsvn_client/conflicts-test.c

Author: stsp Date: Sun Sep 16 10:43:17 2018 New Revision: 1840995 URL: http://svn.apache.org/viewvc?rev=1840995&view=rev Log: Implement support for ambiguous moves for 'local missing' conflicts. * subversion/libsvn_client/conflicts.c (conflict_tree_local_missing_details): Replace the single 'mo

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

Author: stsp Date: Sun Sep 16 09:12:59 2018 New Revision: 1840992 URL: http://svn.apache.org/viewvc?rev=1840992&view=rev Log: * STATUS: Nominate r1840991 Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/bran

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

Author: stsp Date: Sun Sep 16 09:10:58 2018 New Revision: 1840991 URL: http://svn.apache.org/viewvc?rev=1840991&view=rev Log: Prevent an out-of-bounds array access in the conflict resolver. * subversion/libsvn_client/conflicts.c (svn_client_conflict_option_set_moved_to_repos_relpath): Reset our

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

Author: stsp Date: Sun Sep 16 08:57:23 2018 New Revision: 1840990 URL: http://svn.apache.org/viewvc?rev=1840990&view=rev Log: * subversion/libsvn_client/conflicts.c (svn_client_conflict_text_get_resolution_options): Use more precise wording in option descriptions. Modified: subversion/tr