You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/02/07 23:19:43 UTC
svn commit: r1068181 - in /subversion/trunk/tools/diff: diff3.c diff4.c
Author: hwright
Date: Mon Feb 7 22:19:43 2011
New Revision: 1068181
URL: http://svn.apache.org/viewvc?rev=1068181&view=rev
Log:
Update a few more deprecated function calls in tools/
* tools/diff/diff3.c
(do_diff3): Use latest versions of a couple of diff functions.
* tools/diff/diff4.c
(do_diff4): Same.
Modified:
subversion/trunk/tools/diff/diff3.c
subversion/trunk/tools/diff/diff4.c
Modified: subversion/trunk/tools/diff/diff3.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/diff/diff3.c?rev=1068181&r1=1068180&r2=1068181&view=diff
==============================================================================
--- subversion/trunk/tools/diff/diff3.c (original)
+++ subversion/trunk/tools/diff/diff3.c Mon Feb 7 22:19:43 2011
@@ -38,16 +38,16 @@ do_diff3(svn_stream_t *ostream,
{
svn_diff_t *diff;
- SVN_ERR(svn_diff_file_diff3(&diff, original, modified, latest, pool));
+ SVN_ERR(svn_diff_file_diff3_2(&diff, original, modified, latest,
+ svn_diff_file_options_create(pool), pool));
*has_changes = svn_diff_contains_diffs(diff);
- SVN_ERR(svn_diff_file_output_merge(ostream, diff,
- original, modified, latest,
- NULL, NULL, NULL, NULL,
- FALSE,
- FALSE,
- pool));
+ SVN_ERR(svn_diff_file_output_merge2(ostream, diff,
+ original, modified, latest,
+ NULL, NULL, NULL, NULL,
+ svn_diff_conflict_display_modified_latest,
+ pool));
return NULL;
}
Modified: subversion/trunk/tools/diff/diff4.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/diff/diff4.c?rev=1068181&r1=1068180&r2=1068181&view=diff
==============================================================================
--- subversion/trunk/tools/diff/diff4.c (original)
+++ subversion/trunk/tools/diff/diff4.c Mon Feb 7 22:19:43 2011
@@ -40,15 +40,13 @@ do_diff4(svn_stream_t *ostream,
{
svn_diff_t *diff;
- SVN_ERR(svn_diff_file_diff4(&diff,
- original, modified, latest, ancestor,
- pool));
- SVN_ERR(svn_diff_file_output_merge(ostream, diff,
- original, modified, latest,
- NULL, NULL, NULL, NULL,
- FALSE,
- FALSE,
- pool));
+ SVN_ERR(svn_diff_file_diff4_2(&diff, original, modified, latest, ancestor,
+ svn_diff_file_options_create(pool), pool));
+ SVN_ERR(svn_diff_file_output_merge2(ostream, diff,
+ original, modified, latest,
+ NULL, NULL, NULL, NULL,
+ svn_diff_conflict_display_modified_latest,
+ pool));
return NULL;
}