You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2012/06/29 20:07:13 UTC
svn commit: r1355488 - in /subversion/trunk/subversion:
libsvn_wc/conflicts.c libsvn_wc/conflicts.h
tests/libsvn_wc/conflict-data-test.c
Author: rhuijben
Date: Fri Jun 29 18:07:11 2012
New Revision: 1355488
URL: http://svn.apache.org/viewvc?rev=1355488&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
(svn_wc__conflict_skel_is_complete): Remove unneeded pool argument.
* subversion/libsvn_wc/conflicts.h
(svn_wc__conflict_skel_is_complete): Remove unneeded pool argument.
* subversion/tests/libsvn_wc/conflict-data-test.c
(test_serialize_prop_conflict,
test_serialize_text_conflict): Update caller.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
subversion/trunk/subversion/libsvn_wc/conflicts.h
subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1355488&r1=1355487&r2=1355488&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Fri Jun 29 18:07:11 2012
@@ -73,8 +73,7 @@ svn_wc__conflict_skel_create(apr_pool_t
svn_error_t *
svn_wc__conflict_skel_is_complete(svn_boolean_t *complete,
- svn_skel_t *conflict_skel,
- apr_pool_t *scratch_pool)
+ svn_skel_t *conflict_skel)
{
*complete = FALSE;
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.h?rev=1355488&r1=1355487&r2=1355488&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.h (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.h Fri Jun 29 18:07:11 2012
@@ -68,13 +68,10 @@ svn_wc__conflict_skel_create(apr_pool_t
This typically checks if CONFLICT_SKEL contains at least one conflict
and an operation.
-
- Perform temporary allocations in SCRATCH_POOL
- */
+ */
svn_error_t *
svn_wc__conflict_skel_is_complete(svn_boolean_t *complete,
- svn_skel_t *conflict_skel,
- apr_pool_t *scratch_pool);
+ svn_skel_t *conflict_skel);
/* Set 'update' as the conflicting operation in CONFLICT_SKEL.
Modified: subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c?rev=1355488&r1=1355487&r2=1355488&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c Fri Jun 29 18:07:11 2012
@@ -307,7 +307,7 @@ test_serialize_prop_conflict(const svn_t
SVN_TEST_ASSERT(conflict_skel != NULL);
SVN_TEST_ASSERT(svn_skel__list_length(conflict_skel) == 2);
- SVN_ERR(svn_wc__conflict_skel_is_complete(&complete, conflict_skel, pool));
+ SVN_ERR(svn_wc__conflict_skel_is_complete(&complete, conflict_skel));
SVN_TEST_ASSERT(!complete); /* Nothing set */
{
@@ -342,7 +342,7 @@ test_serialize_prop_conflict(const svn_t
pool, pool));
}
- SVN_ERR(svn_wc__conflict_skel_is_complete(&complete, conflict_skel, pool));
+ SVN_ERR(svn_wc__conflict_skel_is_complete(&complete, conflict_skel));
SVN_TEST_ASSERT(!complete); /* Misses operation */
SVN_ERR(svn_wc__conflict_skel_set_op_update(
@@ -352,7 +352,7 @@ test_serialize_prop_conflict(const svn_t
svn_node_dir, pool),
pool, pool));
- SVN_ERR(svn_wc__conflict_skel_is_complete(&complete, conflict_skel, pool));
+ SVN_ERR(svn_wc__conflict_skel_is_complete(&complete, conflict_skel));
SVN_TEST_ASSERT(complete); /* Everything available */
{
@@ -420,7 +420,7 @@ test_serialize_text_conflict(const svn_t
svn_node_dir, pool),
pool, pool));
- SVN_ERR(svn_wc__conflict_skel_is_complete(&complete, conflict_skel, pool));
+ SVN_ERR(svn_wc__conflict_skel_is_complete(&complete, conflict_skel));
SVN_TEST_ASSERT(complete); /* Everything available */
{