svn commit: r1500700 - /subversion/trunk/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c

[st...@apache.org]

Author: stsp
Date: Mon Jul  8 12:48:24 2013
New Revision: 1500700

URL: http://svn.apache.org/r1500700
Log:
Fix use of wrong pointer type in svnraisetreeconflict.

* tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
  (raise_tree_conflict): Use svn_wc_conflict_description3_t, as now
   expected by svn_wc__add_tree_conflict().

Modified:
    subversion/trunk/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c

Modified: subversion/trunk/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c?rev=1500700&r1=1500699&r2=1500700&view=diff
==============================================================================
--- subversion/trunk/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c (original)
+++ subversion/trunk/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c Mon Jul  8 12:48:24 2013
@@ -187,7 +187,7 @@ raise_tree_conflict(int argc, const char
 {
   int i = 0;
   svn_wc_conflict_version_t *left, *right;
-  svn_wc_conflict_description2_t *c;
+  svn_wc_conflict_description3_t *c;
   svn_wc_context_t *wc_ctx;
 
   /* Conflict description parameters */
@@ -223,7 +223,7 @@ raise_tree_conflict(int argc, const char
                                          peg_rev1, kind1, pool);
   right = svn_wc_conflict_version_create2(repos_url2, NULL, path_in_repos2,
                                           peg_rev2, kind2, pool);
-  c = svn_wc_conflict_description_create_tree2(wc_abspath, kind,
+  c = svn_wc_conflict_description_create_tree3(wc_abspath, kind,
                                               operation, left, right, pool);
   c->action = (svn_wc_conflict_action_t)action;
   c->reason = (svn_wc_conflict_reason_t)reason;