svn commit: r1730783 - in /subversion/branches/1.9.x: ./ STATUS tools/client-side/svn-graph.pl

2016-02-16 Thread svn-role
Author: svn-role Date: Wed Feb 17 04:00:50 2016 New Revision: 1730783 URL: http://svn.apache.org/viewvc?rev=1730783&view=rev Log: Merge the r1729060 group from trunk: * r1729060, r1729519 svn-graph.pl: Canonicalize user-provided URI and hard-coded relpath Justification: Fixes a non-ca

svn commit: r1730781 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_wc/deprecated.c

2016-02-16 Thread svn-role
Author: svn-role Date: Wed Feb 17 04:00:40 2016 New Revision: 1730781 URL: http://svn.apache.org/viewvc?rev=1730781&view=rev Log: Merge r1728308 from trunk: * r1728308 Pass on correct parameter in deprecated function. Justification: Correct behaviour for deprecated API. Votes:

svn commit: r1730782 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_subr/gpg_agent.c

2016-02-16 Thread svn-role
Author: svn-role Date: Wed Feb 17 04:00:46 2016 New Revision: 1730782 URL: http://svn.apache.org/viewvc?rev=1730782&view=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: r1730716 - in /subversion/trunk/subversion: include/private/svn_wc_private.h include/svn_client.h libsvn_client/resolved.c libsvn_wc/conflicts.c svn/resolve-cmd.c

2016-02-16 Thread stsp
Author: stsp Date: Tue Feb 16 17:05:25 2016 New Revision: 1730716 URL: http://svn.apache.org/viewvc?rev=1730716&view=rev Log: Introduce svn_wc__conflict_tree_update_raise_moved_away(), a private libsvn_wc API function for use by libsvn_client's conflict resolver. This API may raise an error if ot

svn commit: r1730708 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/resolved.c

2016-02-16 Thread stsp
Author: stsp Date: Tue Feb 16 16:06:09 2016 New Revision: 1730708 URL: http://svn.apache.org/viewvc?rev=1730708&view=rev Log: Return SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE where applicable, instead of returning the very generic SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE error code. * subversion/

svn commit: r1730695 - /subversion/trunk/subversion/include/svn_error_codes.h

2016-02-16 Thread stsp
Author: stsp Date: Tue Feb 16 14:46:18 2016 New Revision: 1730695 URL: http://svn.apache.org/viewvc?rev=1730695&view=rev Log: Declare a new error code for use by the conflict resolver in libsvn_client. * subversion/include/svn_error_codes.h (SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE): Decla

svn commit: r1730689 - /subversion/trunk/subversion/libsvn_wc/wc_db.h

2016-02-16 Thread stsp
Author: stsp Date: Tue Feb 16 13:43:10 2016 New Revision: 1730689 URL: http://svn.apache.org/viewvc?rev=1730689&view=rev Log: * subversion/libsvn_wc/wc_db.h (svn_wc__db_op_raise_moved_away: Fix typo in comment. Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h Modified: subversion/tr

svn commit: r1730688 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

2016-02-16 Thread stsp
Author: stsp Date: Tue Feb 16 13:42:06 2016 New Revision: 1730688 URL: http://svn.apache.org/viewvc?rev=1730688&view=rev Log: * subversion/libsvn_wc/conflicts.c (resolve_tree_conflict_on_node): Fix comment for clarity. Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c Modified: s

svn commit: r1730677 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

2016-02-16 Thread stsp
Author: stsp Date: Tue Feb 16 12:42:53 2016 New Revision: 1730677 URL: http://svn.apache.org/viewvc?rev=1730677&view=rev Log: * subversion/libsvn_wc/conflicts.c (resolve_tree_conflict_on_node): Update comment which referred to a function that doesn't exist. Modified: subversion/trunk/sub

svn commit: r1730670 - /subversion/trunk/subversion/include/svn_client.h

2016-02-16 Thread philip
Author: philip Date: Tue Feb 16 12:11:16 2016 New Revision: 1730670 URL: http://svn.apache.org/viewvc?rev=1730670&view=rev Log: * subversion/include/svn_client.h (enum svn_client_conflict_option_id_t): Remove comma after last element. Modified: subversion/trunk/subversion/include/svn_client

svn commit: r1730661 - /subversion/branches/1.9.x/STATUS

2016-02-16 Thread rhuijben
Author: rhuijben Date: Tue Feb 16 11:24:34 2016 New Revision: 1730661 URL: http://svn.apache.org/viewvc?rev=1730661&view=rev Log: * STATUS: Cast some votes. Approve 3 patches. Modified: subversion/branches/1.9.x/STATUS Modified: subversion/branches/1.9.x/STATUS URL: http://svn.apache.org/vi

svn commit: r1730654 - /subversion/branches/1.9.x/STATUS

2016-02-16 Thread danielsh
Author: danielsh Date: Tue Feb 16 10:54:31 2016 New Revision: 1730654 URL: http://svn.apache.org/viewvc?rev=1730654&view=rev Log: * STATUS: Vote for r1729519. Modified: subversion/branches/1.9.x/STATUS Modified: subversion/branches/1.9.x/STATUS URL: http://svn.apache.org/viewvc/subversion/b