diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-04-29 19:16:59 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-04-29 19:16:59 +0000 |
| commit | c94cceea9c2262c5b2ad5f215bb9a8ae48b02764 (patch) | |
| tree | dbb8174cbf6f1cc45b8de8031b18adb4030509a8 /subversion/libsvn_diff | |
| parent | dc5d469d6574e9fb03bdd793658bb371315b306a (diff) | |
| download | src-c94cceea9c2262c5b2ad5f215bb9a8ae48b02764.tar.gz src-c94cceea9c2262c5b2ad5f215bb9a8ae48b02764.zip | |
Vendor import of subversion-1.9.4.vendor/subversion/subversion-1.9.4
Notes
Notes:
svn path=/vendor/subversion/dist/; revision=298794
svn path=/vendor/subversion/subversion-1.9.4/; revision=298795; tag=vendor/subversion/subversion-1.9.4
Diffstat (limited to 'subversion/libsvn_diff')
| -rw-r--r-- | subversion/libsvn_diff/binary_diff.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/subversion/libsvn_diff/binary_diff.c b/subversion/libsvn_diff/binary_diff.c index d42b2e53bf1b..035794dbed57 100644 --- a/subversion/libsvn_diff/binary_diff.c +++ b/subversion/libsvn_diff/binary_diff.c @@ -194,22 +194,22 @@ svn_diff_output_binary(svn_stream_t *output_stream, 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 + /* ### 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(original_full, - svn_stream_from_aprfile2(original_apr, FALSE, subpool), + 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 + /* ### 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(latest_full, - svn_stream_from_aprfile2(latest_apr, FALSE, subpool), + SVN_ERR(write_literal(original_full, + svn_stream_from_aprfile2(original_apr, FALSE, subpool), output_stream, cancel_func, cancel_baton, scratch_pool)); |