subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dan...@apache.org
Subject svn commit: r958260 - /subversion/trunk/subversion/libsvn_client/diff.c
Date Sat, 26 Jun 2010 17:56:07 GMT
Author: dannas
Date: Sat Jun 26 17:56:06 2010
New Revision: 958260

URL: http://svn.apache.org/viewvc?rev=958260&view=rev
Log:
With SVN_EXPERIMENTAL_PATCH defined, only print the git diff header
for deleted paths instead of as previously adding all the hunks that
have been deleted. We *know* from the diff header that the file should
be deleted.

* subversion/libsvn_client/diff.c
  (diff_content_changed): If a delete, we're done after printing
    the git diff header.

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=958260&r1=958259&r2=958260&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Sat Jun 26 17:56:06 2010
@@ -705,10 +705,11 @@ 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_added)
             {



Mime
View raw message