You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2010/06/30 20:44:41 UTC
svn commit: r959406 - /subversion/trunk/subversion/libsvn_client/diff.c
Author: dannas
Date: Wed Jun 30 18:44:41 2010
New Revision: 959406
URL: http://svn.apache.org/viewvc?rev=959406&view=rev
Log:
Revert r958260, 'only print the git diff header for deleted paths'.
A git unidiff for a deleted path should contain hunks. Both Git and
Mercurial prints them. End of story.
* subversion/libsvn_client/diff.c
(diff_content_changed): Do print hunks for deleted paths.
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=959406&r1=959405&r2=959406&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Wed Jun 30 18:44:41 2010
@@ -710,10 +710,9 @@ diff_content_changed(const char *path,
os,
diff_cmd_baton->header_encoding,
path, subpool));
- svn_pool_destroy(subpool);
-
- /* We only display the git diff header for deletes. */
- return SVN_NO_ERROR;
+ label1 = diff_label(apr_psprintf(subpool, "a/%s", path1), rev1,
+ subpool);
+ label2 = diff_label("/dev/null", rev2, subpool);
}
else if (operation == svn_diff_op_copied)