Author: svn-role
Date: Wed Sep 5 04:02:40 2012
New Revision: 1380973
URL: http://svn.apache.org/viewvc?rev=1380973&view=rev
Log:
Merge r1380697 from trunk:
* r1380697
Fix duplicated Index: lines in 'svn diff' output with external diff tool.
Justification:
Obvious bug. User complained and submitted patch.
Votes:
+1: stsp, philip, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_client/diff.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1380697
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1380973&r1=1380972&r2=1380973&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Sep 5 04:02:40 2012
@@ -144,10 +144,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1380697
- Fix duplicated Index: lines in 'svn diff' output with external diff tool.
- Justification:
- Obvious bug. User complained and submitted patch.
- Votes:
- +1: stsp, philip, rhuijben
Modified: subversion/branches/1.7.x/subversion/libsvn_client/diff.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_client/diff.c?rev=1380973&r1=1380972&r2=1380973&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_client/diff.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_client/diff.c Wed Sep 5
04:02:40 2012
@@ -1018,6 +1018,9 @@ diff_content_changed(const char *path,
tmpfile1, tmpfile2,
&exitcode, diff_cmd_baton->outfile, errfile,
diff_cmd_baton->diff_cmd, 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 */
{
