subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1704573 - in /subversion/trunk/subversion: libsvn_client/patch.c libsvn_diff/binary_diff.c
Date Tue, 22 Sep 2015 10:51:27 GMT
Author: rhuijben
Date: Tue Sep 22 10:51:21 2015
New Revision: 1704573

URL: http://svn.apache.org/viewvc?rev=1704573&view=rev
Log:
Tweak some comments in the diff/patch code. No functional changes.

* subversion/libsvn_client/patch.c
  (resolve_target_path): Add comment to note that we have a bug.

* subversion/libsvn_diff/binary_diff.c
  (svn_diff_output_binary): Revert some accidental whitespace changes
    committed in r1704292.

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

Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=1704573&r1=1704572&r2=1704573&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Tue Sep 22 10:51:21 2015
@@ -489,6 +489,8 @@ resolve_target_path(patch_target_t *targ
       SVN_ERR(svn_wc__node_was_moved_away(&moved_to_abspath, NULL,
                                           wc_ctx, target->local_abspath,
                                           result_pool, scratch_pool));
+      /* ### BUG: moved_to_abspath contains the target where the op-root was
+         ### moved to... not the target itself! */
       if (moved_to_abspath)
         {
           target->local_abspath = moved_to_abspath;

Modified: subversion/trunk/subversion/libsvn_diff/binary_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/binary_diff.c?rev=1704573&r1=1704572&r2=1704573&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/binary_diff.c (original)
+++ subversion/trunk/subversion/libsvn_diff/binary_diff.c Tue Sep 22 10:51:21 2015
@@ -255,8 +255,8 @@ 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 latest->original would be
-  shorter than the zipped data. For now lets assume that it is not
-  and just dump the literal data */
+         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,
@@ -266,8 +266,8 @@ svn_diff_output_binary(svn_stream_t *out
   SVN_ERR(svn_stream_puts(output_stream, 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 */
+         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,



Mime
View raw message