Re: svn commit: r1727621 - in /subversion/trunk/subversion: svn/svn.c svnadmin/svnadmin.c svnbench/svnbench.c svnfsfs/svnfsfs.c svnlook/svnlook.c svnrdump/svnrdump.c svnsync/svnsync.c

2016-01-29 Thread Daniel Shahaf
phi...@apache.org wrote on Fri, Jan 29, 2016 at 18:55:22 -: > +#ifndef WIN32 > + /* If cancelled by SIGINT then attempt to exit via SIGINT. This > + allows the shell to use WIFSIGNALED and WTERMSIG to detect the > + SIGINT. See http://www.cons.org/cracauer/sigint.html */ > + if (ca

svn commit: r1727621 - in /subversion/trunk/subversion: svn/svn.c svnadmin/svnadmin.c svnbench/svnbench.c svnfsfs/svnfsfs.c svnlook/svnlook.c svnrdump/svnrdump.c svnsync/svnsync.c

2016-01-29 Thread philip
Author: philip Date: Fri Jan 29 18:55:22 2016 New Revision: 1727621 URL: http://svn.apache.org/viewvc?rev=1727621&view=rev Log: * subversion/svn/svn.c * subversion/svnadmin/svnadmin.c * subversion/svnbench/svnbench.c * subversion/svnfsfs/svnfsfs.c * subversion/svnlook/svnlook.c * subversion/svnrdu

svn commit: r1727618 - /subversion/trunk/subversion/svn/conflict-callbacks.c

2016-01-29 Thread stsp
Author: stsp Date: Fri Jan 29 17:18:05 2016 New Revision: 1727618 URL: http://svn.apache.org/viewvc?rev=1727618&view=rev Log: In the interactive conflict resolver, use the option id 'unspecified' to indicate the user hasn't made a choice yet, rather than 'undefined' which is otherwise used to mark

svn commit: r1727617 - /subversion/trunk/subversion/svn/conflict-callbacks.c

2016-01-29 Thread stsp
Author: stsp Date: Fri Jan 29 17:05:53 2016 New Revision: 1727617 URL: http://svn.apache.org/viewvc?rev=1727617&view=rev Log: Split handling of --accept option and interactive prompting into 2 functions. No functional change. * subversion/svn/conflict-callbacks.c (resolve_conflict_by_accept_op

svn commit: r1727616 - /subversion/trunk/subversion/svn/conflict-callbacks.c

2016-01-29 Thread stsp
Author: stsp Date: Fri Jan 29 16:53:04 2016 New Revision: 1727616 URL: http://svn.apache.org/viewvc?rev=1727616&view=rev Log: Stop passing a pointer to the --accept option value to interactive conflict handlers, now that the 'quit' command at the conflict prompt command works without this hack. *

svn commit: r1727615 - /subversion/trunk/subversion/svn/resolve-cmd.c

2016-01-29 Thread stsp
Author: stsp Date: Fri Jan 29 16:47:52 2016 New Revision: 1727615 URL: http://svn.apache.org/viewvc?rev=1727615&view=rev Log: Make the 'quit' command at the conflict prompt actually quit right away. This command worked by side-effect of postponing all remaining conflicts but didn't actually stop

svn commit: r1727609 - /subversion/trunk/subversion/svn/conflict-callbacks.c

2016-01-29 Thread stsp
Author: stsp Date: Fri Jan 29 16:14:52 2016 New Revision: 1727609 URL: http://svn.apache.org/viewvc?rev=1727609&view=rev Log: * subversion/svn/conflict-callbacks.c (svn_cl__interactive_conflict_baton_t): Remove. Has been unused for a while. Modified: subversion/trunk/subversion/svn/conflict

svn commit: r1727596 - /subversion/trunk/subversion/svn/conflict-callbacks.c

2016-01-29 Thread stsp
Author: stsp Date: Fri Jan 29 14:56:32 2016 New Revision: 1727596 URL: http://svn.apache.org/viewvc?rev=1727596&view=rev Log: Follow-up to r1727593, which broke some tests: Fix errors in handling the --accept option and postponed conflicts. * subversion/svn/conflict-callbacks.c (handle_text_co

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

2016-01-29 Thread stsp
Author: stsp Date: Fri Jan 29 14:33:38 2016 New Revision: 1727593 URL: http://svn.apache.org/viewvc?rev=1727593&view=rev Log: Refactor code in 'svn resolve' such that a call to the function svn_client_conflict_prop_get_propname() can be removed. This function should not exist because an svn_clien

svn propchange: r1727583 - svn:log

2016-01-29 Thread stsp
Author: stsp Revision: 1727583 Modified property: svn:log Modified: svn:log at Fri Jan 29 13:41:43 2016 -- --- svn:log (original) +++ svn:log Fri Jan 29 13:41:43 2016 @@ -1,4 +1,4 @@ -Fix support for multiple conflict prop

svn commit: r1727583 - /subversion/trunk/subversion/libsvn_client/resolved.c

2016-01-29 Thread stsp
Author: stsp Date: Fri Jan 29 13:40:23 2016 New Revision: 1727583 URL: http://svn.apache.org/viewvc?rev=1727583&view=rev Log: Fix support for multiple conflict properties on a node in the new resolver. An implementation bug in the new libsvn_client conflict code prevented the client from resolvin

svn commit: r1727547 - /subversion/trunk/subversion/svn/conflict-callbacks.c

2016-01-29 Thread stsp
Author: stsp Date: Fri Jan 29 11:43:57 2016 New Revision: 1727547 URL: http://svn.apache.org/viewvc?rev=1727547&view=rev Log: Put the code 'svn' uses to mark a conflict resolved into a subroutine. No functional change. This just prepares 'svn' for making more use of the new svn_client_conflict AP

svn commit: r1727525 - /subversion/trunk/tools/dev/which-error.py

2016-01-29 Thread philip
Author: philip Date: Fri Jan 29 10:51:34 2016 New Revision: 1727525 URL: http://svn.apache.org/viewvc?rev=1727525&view=rev Log: * tools/dev/which-error.py (print_error): Followup to r1727512, include the code. Modified: subversion/trunk/tools/dev/which-error.py Modified: subversion/trunk/t

svn commit: r1727512 - /subversion/trunk/tools/dev/which-error.py

2016-01-29 Thread danielsh
Author: danielsh Date: Fri Jan 29 10:15:23 2016 New Revision: 1727512 URL: http://svn.apache.org/viewvc?rev=1727512&view=rev Log: * tools/dev/which-error.py (print_error): Handle serf-generated error codes. (Currently, the only way to distinguish serf-generated error codes from svn-generat