subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1704292 - /subversion/trunk/subversion/libsvn_diff/binary_diff.c
Date Mon, 21 Sep 2015 12:58:10 GMT
Author: rhuijben
Date: Mon Sep 21 12:58:06 2015
New Revision: 1704292

URL: http://svn.apache.org/viewvc?rev=1704292&view=rev
Log:
Auch... Write binary patches in the order git would: first new then old.

* subversion/libsvn_diff/binary_diff.c
  (svn_diff_output_binary): Write diff in proper order.

Modified:
    subversion/trunk/subversion/libsvn_diff/binary_diff.c

Modified: subversion/trunk/subversion/libsvn_diff/binary_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/binary_diff.c?rev=1704292&r1=1704291&r2=1704292&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/binary_diff.c (original)
+++ subversion/trunk/subversion/libsvn_diff/binary_diff.c Mon Sep 21 12:58:06 2015
@@ -192,22 +192,22 @@ svn_diff_output_binary(svn_stream_t *out
 
   SVN_ERR(svn_stream_puts(output_stream, "GIT binary patch" APR_EOL_STR));
 
-  /* ### git would first calculate if a git-delta original->latest would be
-         shorter than the zipped data. For now lets assume that it is not
-         and just dump the literal data */
-  SVN_ERR(write_literal(original_full,
-                        svn_stream_from_aprfile2(original_apr, FALSE, subpool),
+  /* ### git would first calculate if a git-delta latest->original would be
+  shorter than the zipped data. For now lets assume that it is not
+  and just dump the literal data */
+  SVN_ERR(write_literal(latest_full,
+                        svn_stream_from_aprfile2(latest_apr, FALSE, subpool),
                         output_stream,
                         cancel_func, cancel_baton,
                         scratch_pool));
   svn_pool_clear(subpool);
   SVN_ERR(svn_stream_puts(output_stream, APR_EOL_STR));
 
-  /* ### git would first calculate if a git-delta latest->original would be
-         shorter than the zipped data. For now lets assume that it is not
-         and just dump the literal data */
-  SVN_ERR(write_literal(latest_full,
-                        svn_stream_from_aprfile2(latest_apr, FALSE, subpool),
+  /* ### git would first calculate if a git-delta original->latest would be
+  shorter than the zipped data. For now lets assume that it is not
+  and just dump the literal data */
+  SVN_ERR(write_literal(original_full,
+                        svn_stream_from_aprfile2(original_apr, FALSE, subpool),
                         output_stream,
                         cancel_func, cancel_baton,
                         scratch_pool));



Mime
View raw message