You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/09/04 17:52:47 UTC
svn commit: r1380697 - /subversion/trunk/subversion/libsvn_client/diff.c
Author: stsp
Date: Tue Sep 4 15:52:47 2012
New Revision: 1380697
URL: http://svn.apache.org/viewvc?rev=1380697&view=rev
Log:
* subversion/libsvn_client/diff.c:
(diff_content_changed): Mark path as visited if diffed by external tool.
Fixes duplicate occurrences of Index: lines.
Patch by: Alexey Neyman <st...@att.net>
Modified:
subversion/trunk/subversion/libsvn_client/diff.c
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1380697&r1=1380696&r2=1380697&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Tue Sep 4 15:52:47 2012
@@ -1044,6 +1044,9 @@ diff_content_changed(const char *path,
subpool, subpool));
SVN_ERR(svn_stream_copy3(stream, svn_stream_disown(errstream, subpool),
NULL, NULL, subpool));
+
+ /* We have a printed a diff for this path, mark it as visited. */
+ mark_path_as_visited(diff_cmd_baton, path);
}
else /* use libsvn_diff to generate the diff */
{