svn commit: r1498879 - /subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c

[stsp]

Author: stsp
Date: Tue Jul  2 11:20:13 2013
New Revision: 1498879

URL: http://svn.apache.org/r1498879
Log:
* subversion/tests/libsvn_wc/conflict-data-test.c
  (test_deserialize_tree_conflict): Use svn_wc_conflict_description3_t for
   expected tree conflict test data.

Modified:
    subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c

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=1498879&r1=1498878&r2=1498879&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 
11:20:13 2013
@@ -217,7 +217,7 @@ static svn_error_t *
 test_deserialize_tree_conflict(apr_pool_t *pool)
 {
   const svn_wc_conflict_description3_t *conflict;
-  svn_wc_conflict_description2_t *exp_conflict;
+  svn_wc_conflict_description3_t *exp_conflict;
   const char *tree_conflict_data;
   const char *local_abspath;
   const svn_skel_t *skel;
@@ -226,7 +226,7 @@ test_deserialize_tree_conflict(apr_pool_
                         "(version 0  2 -1 0  0 ) (version 0  2 -1 0  0 ))";
 
   SVN_ERR(svn_dirent_get_absolute(&local_abspath, "Foo.c", pool));
-  exp_conflict = svn_wc_conflict_description_create_tree2(
+  exp_conflict = svn_wc_conflict_description_create_tree3(
                         local_abspath, svn_node_file, svn_wc_operation_update,
                         NULL, NULL, pool);
   exp_conflict->action = svn_wc_conflict_action_delete;