Author: ivan
Date: Tue Oct 18 08:11:58 2016
New Revision: 1765398
URL: http://svn.apache.org/viewvc?rev=1765398&view=rev
Log:
Extend XML parser tests to validate that callbacks are not invoked after
svn_xml_signal_bailout() is called.
* subversion/tests/libsvn_subr/xml-test.c
(xml_callbacks_bat
Author: ivan
Date: Tue Oct 18 12:14:34 2016
New Revision: 1765424
URL: http://svn.apache.org/viewvc?rev=1765424&view=rev
Log:
Use XML_StopParser with Expat >= 1.95.8 to abort XML parsing in the middle
of parse buffer if svn_xml_signal_bailout() was called.
(Mostly copied from subversion/libsvn_ra
Author: kotkov
Date: Tue Oct 18 14:57:54 2016
New Revision: 1765452
URL: http://svn.apache.org/viewvc?rev=1765452&view=rev
Log:
Add a couple of failing tests for "remote move vs local edit" tree conflict
resolution upon merge.
These tests exploit a few problems in how we merge the file properties
Author: kotkov
Date: Tue Oct 18 15:41:58 2016
New Revision: 1765466
URL: http://svn.apache.org/viewvc?rev=1765466&view=rev
Log:
In the tree conflict resolver, fix merging text content in the "remote move"
vs "local edit" scenario.
The issue was that if the conflict happened during merge, we were
Author: stsp
Date: Tue Oct 18 21:00:57 2016
New Revision: 1765506
URL: http://svn.apache.org/viewvc?rev=1765506&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(resolve_incoming_delete_accept): Lock the parent of the node we're deleting,
else the resolver will error out erroneously accep
Author: stsp
Date: Tue Oct 18 21:07:55 2016
New Revision: 1765507
URL: http://svn.apache.org/viewvc?rev=1765507&view=rev
Log:
* subversion/include/svn_wc.h
(svn_wc_delete4): Fix typo in docstring.
Modified:
subversion/trunk/subversion/include/svn_wc.h
Modified: subversion/trunk/subversion/
Author: stsp
Revision: 1765506
Modified property: svn:log
Modified: svn:log at Tue Oct 18 21:09:21 2016
--
--- svn:log (original)
+++ svn:log Tue Oct 18 21:09:21 2016
@@ -1,5 +1,5 @@
* subversion/libsvn_client/conflicts.c
