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
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
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
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
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.
*
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
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
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
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
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
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
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
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
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
14 matches
Mail list logo