subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dan...@apache.org
Subject svn commit: r952344 - /subversion/trunk/subversion/libsvn_client/diff.c
Date Mon, 07 Jun 2010 17:41:07 GMT
Author: dannas
Date: Mon Jun  7 17:41:07 2010
New Revision: 952344

URL: http://svn.apache.org/viewvc?rev=952344&view=rev
Log:

Follow-up to r952205. Fix mixed up source and destination for copies
and moves when printing git unidiff headers.

* subversion/libsvn_client/diff.c
  (print_git_diff_header_copied
   print_git_diff_header_moved): Use 'copyfrom_path' for source and
    'path' for destination - not the other way around.

Suggested by: stsp

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=952344&r1=952343&r2=952344&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Mon Jun  7 17:41:07 2010
@@ -352,10 +352,10 @@ print_git_diff_header_copied(svn_stream_
                                       "diff --git a/%s b/%s%s",
                                       copyfrom_path, path, APR_EOL_STR));
   SVN_ERR(svn_stream_printf_from_utf8(os, header_encoding, result_pool,
-                                      "copy from %s%s", path, APR_EOL_STR));
-  SVN_ERR(svn_stream_printf_from_utf8(os, header_encoding, result_pool,
-                                      "copy to %s%s", copyfrom_path, 
+                                      "copy from %s%s", copyfrom_path,
                                       APR_EOL_STR));
+  SVN_ERR(svn_stream_printf_from_utf8(os, header_encoding, result_pool,
+                                      "copy to %s%s", path, APR_EOL_STR));
   return SVN_NO_ERROR;
 }
 
@@ -372,11 +372,10 @@ print_git_diff_header_moved(svn_stream_t
                                       "diff --git a/%s b/%s%s",
                                       copyfrom_path, path, APR_EOL_STR));
   SVN_ERR(svn_stream_printf_from_utf8(os, header_encoding, result_pool,
-                                      "rename from %s%s", path, 
+                                      "rename from %s%s", copyfrom_path, 
                                       APR_EOL_STR));
   SVN_ERR(svn_stream_printf_from_utf8(os, header_encoding, result_pool,
-                                      "rename to %s%s", copyfrom_path, 
-                                      APR_EOL_STR));
+                                      "rename to %s%s", path, APR_EOL_STR));
   return SVN_NO_ERROR;
 }
 



Mime
View raw message