You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/07/02 14:45:04 UTC
svn commit: r1498908 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_client/merge.c
libsvn_wc/tree_conflicts.c tests/libsvn_wc/conflict-data-test.c
Author: stsp
Date: Tue Jul 2 12:45:04 2013
New Revision: 1498908
URL: http://svn.apache.org/r1498908
Log:
Update svn_wc__add_tree_conflict() to svn_wc_conflict_description3_t.
No functional change yet, since tree conflicts are currently described in the
same way by svn_wc_conflict_description3_t and svn_wc_conflict_description2_t.
* subversion/include/private/svn_wc_private.h
(svn_wc__add_tree_conflict): Update declaration.
* subversion/libsvn_client/merge.c
(merge_dir_baton_t): Store tree conflicts as svn_wc_conflict_description3_t.
(record_tree_conflict, merge_file_opened,
merge_dir_opened): Use svn_wc_conflict_description3_t.
* subversion/libsvn_wc/tree_conflicts.c
(svn_wc__add_tree_conflict): Expect svn_wc_conflict_description3_t.
Fix whitespace formatting inconsistency while here.
* subversion/tests/libsvn_wc/conflict-data-test.c
(test_read_write_tree_conflicts): Update caller.
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=1498908&r1=1498907&r2=1498908&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Tue Jul 2 12:45:04 2013
@@ -311,7 +311,7 @@ svn_wc__get_tree_conflict(const svn_wc_c
*/
svn_error_t *
svn_wc__add_tree_conflict(svn_wc_context_t *wc_ctx,
- const svn_wc_conflict_description2_t *conflict,
+ const svn_wc_conflict_description3_t *conflict,
apr_pool_t *scratch_pool);
/* Remove any tree conflict on victim @a victim_abspath using @a wc_ctx.
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1498908&r1=1498907&r2=1498908&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Jul 2 12:45:04 2013
@@ -1198,7 +1198,7 @@ struct merge_dir_baton_t
apr_hash_t *pending_deletes;
/* NULL, or an hashtable mapping const char * LOCAL_ABSPATHs to
- a const svn_wc_conflict_description2_t * instance, describing the just
+ a const svn_wc_conflict_description3_t * instance, describing the just
installed conflict */
apr_hash_t *new_tree_conflicts;
@@ -1301,7 +1301,7 @@ record_tree_conflict(merge_cmd_baton_t *
svn_node_kind_t node_kind,
svn_wc_conflict_action_t action,
svn_wc_conflict_reason_t reason,
- const svn_wc_conflict_description2_t *existing_conflict,
+ const svn_wc_conflict_description3_t *existing_conflict,
svn_boolean_t notify_tc,
apr_pool_t *scratch_pool)
{
@@ -1319,7 +1319,7 @@ record_tree_conflict(merge_cmd_baton_t *
if (!merge_b->record_only && !merge_b->dry_run)
{
- svn_wc_conflict_description2_t *conflict;
+ svn_wc_conflict_description3_t *conflict;
const svn_wc_conflict_version_t *left;
const svn_wc_conflict_version_t *right;
apr_pool_t *result_pool = parent_baton ? parent_baton->pool
@@ -1358,7 +1358,7 @@ record_tree_conflict(merge_cmd_baton_t *
if (existing_conflict != NULL && existing_conflict->src_left_version)
left = existing_conflict->src_left_version;
- conflict = svn_wc_conflict_description_create_tree2(
+ conflict = svn_wc_conflict_description_create_tree3(
local_abspath, node_kind, svn_wc_operation_merge,
left, right, result_pool);
@@ -1848,7 +1848,7 @@ merge_file_opened(void **new_file_baton,
}
else
{
- const svn_wc_conflict_description2_t *old_tc = NULL;
+ const svn_wc_conflict_description3_t *old_tc = NULL;
/* The node doesn't exist pre-merge: We have an addition */
fb->added = TRUE;
@@ -2605,7 +2605,7 @@ merge_dir_opened(void **new_dir_baton,
}
else
{
- const svn_wc_conflict_description2_t *old_tc = NULL;
+ const svn_wc_conflict_description3_t *old_tc = NULL;
/* The node doesn't exist pre-merge: We have an addition */
db->added = TRUE;
Modified: subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/tree_conflicts.c?rev=1498908&r1=1498907&r2=1498908&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/tree_conflicts.c Tue Jul 2 12:45:04 2013
@@ -401,7 +401,7 @@ svn_wc__del_tree_conflict(svn_wc_context
svn_error_t *
svn_wc__add_tree_conflict(svn_wc_context_t *wc_ctx,
- const svn_wc_conflict_description2_t *conflict,
+ const svn_wc_conflict_description3_t *conflict,
apr_pool_t *scratch_pool)
{
svn_boolean_t existing_conflict;
@@ -443,7 +443,7 @@ svn_wc__add_tree_conflict(svn_wc_context
NULL,
scratch_pool, scratch_pool));
- switch(conflict->operation)
+ switch (conflict->operation)
{
case svn_wc_operation_update:
default:
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=1498908&r1=1498907&r2=1498908&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c Tue Jul 2 12:45:04 2013
@@ -316,11 +316,9 @@ test_read_write_tree_conflicts(const svn
/* Write */
SVN_ERR(svn_wc__add_tree_conflict(sbox.wc_ctx, /*child1_abspath,*/
- svn_wc__cd3_to_cd2(conflict1, pool),
- pool));
+ conflict1, pool));
SVN_ERR(svn_wc__add_tree_conflict(sbox.wc_ctx, /*child2_abspath,*/
- svn_wc__cd3_to_cd2(conflict2, pool),
- pool));
+ conflict2, pool));
/* Query (conflict1 through WC-DB API, conflict2 through WC API) */
{