svn commit: r1618912 - /subversion/trunk/subversion/libsvn_wc/tree_conflicts.c

[stsp]

Author: stsp
Date: Tue Aug 19 17:38:50 2014
New Revision: 1618912

URL: http://svn.apache.org/r1618912
Log:
Follow-up to r1618906: Resolve a deprecation warning.

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__get_tree_conflict): Call non-deprecated
   svn_wc_conflict_description2_dup() function.

Modified:
    subversion/trunk/subversion/libsvn_wc/tree_conflicts.c

Modified: subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/tree_conflicts.c?rev=1618912&r1=1618911&r2=1618912&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/tree_conflicts.c Tue Aug 19 17:38:50 
2014
@@ -502,7 +502,7 @@ svn_wc__get_tree_conflict(const svn_wc_c
 
       if (desc->kind == svn_wc_conflict_kind_tree)
         {
-          *tree_conflict = svn_wc__conflict_description2_dup(desc, 
result_pool);
+          *tree_conflict = svn_wc_conflict_description2_dup(desc, result_pool);
           return SVN_NO_ERROR;
         }
     }