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 2013/01/08 15:42:31 UTC
svn commit: r1430305 - in /subversion/trunk/subversion/libsvn_wc:
externals.c tree_conflicts.c workqueue.c
Author: rhuijben
Date: Tue Jan 8 14:42:30 2013
New Revision: 1430305
URL: http://svn.apache.org/viewvc?rev=1430305&view=rev
Log:
Following up on r1430302, fix several compile errors that I
didn't see locally and didn't produce test errors.
* subversion/libsvn_wc/externals.c
(close_file): Update caller.
* subversion/libsvn_wc/tree_conflicts.c
(svn_wc__add_tree_conflict): Update caller.
* subversion/libsvn_wc/workqueue.c
(run_set_text_conflict_markers): Update caller.
Modified:
subversion/trunk/subversion/libsvn_wc/externals.c
subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
subversion/trunk/subversion/libsvn_wc/workqueue.c
Modified: subversion/trunk/subversion/libsvn_wc/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/externals.c?rev=1430305&r1=1430304&r2=1430305&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/externals.c (original)
+++ subversion/trunk/subversion/libsvn_wc/externals.c Tue Jan 8 14:42:30 2013
@@ -844,6 +844,13 @@ close_file(void *file_baton,
eb->original_revision,
svn_node_file,
pool),
+ svn_wc_conflict_version_create2(
+ eb->repos_root_url,
+ eb->repos_uuid,
+ repos_relpath,
+ *eb->target_revision,
+ svn_node_file,
+ pool),
pool, pool));
Modified: subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/tree_conflicts.c?rev=1430305&r1=1430304&r2=1430305&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/tree_conflicts.c Tue Jan 8 14:42:30 2013
@@ -440,11 +440,13 @@ svn_wc__add_tree_conflict(svn_wc_context
default:
SVN_ERR(svn_wc__conflict_skel_set_op_update(conflict_skel,
conflict->src_left_version,
+ conflict->src_right_version,
scratch_pool, scratch_pool));
break;
case svn_wc_operation_switch:
SVN_ERR(svn_wc__conflict_skel_set_op_switch(conflict_skel,
conflict->src_left_version,
+ conflict->src_right_version,
scratch_pool, scratch_pool));
break;
case svn_wc_operation_merge:
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1430305&r1=1430304&r2=1430305&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Tue Jan 8 14:42:30 2013
@@ -1316,7 +1316,7 @@ run_set_text_conflict_markers(svn_wc__db
/* No conflict exists, create a basic skel */
conflicts = svn_wc__conflict_skel_create(scratch_pool);
- SVN_ERR(svn_wc__conflict_skel_set_op_update(conflicts, NULL,
+ SVN_ERR(svn_wc__conflict_skel_set_op_update(conflicts, NULL, NULL,
scratch_pool,
scratch_pool));
}
@@ -1381,7 +1381,7 @@ run_set_property_conflict_marker(svn_wc_
/* No conflict exists, create a basic skel */
conflicts = svn_wc__conflict_skel_create(scratch_pool);
- SVN_ERR(svn_wc__conflict_skel_set_op_update(conflicts, NULL,
+ SVN_ERR(svn_wc__conflict_skel_set_op_update(conflicts, NULL, NULL,
scratch_pool,
scratch_pool));
}