You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2014/10/27 06:34:19 UTC
[3/7] git commit: Updated svn::diff/patch to use newer versions of
functions.
Updated svn::diff/patch to use newer versions of functions.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6a778df0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6a778df0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6a778df0
Branch: refs/heads/master
Commit: 6a778df0f6cd31004fd209ddf821f524652e4c19
Parents: fc6f59e
Author: Benjamin Hindman <be...@gmail.com>
Authored: Sat Oct 25 16:26:03 2014 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Sun Oct 26 22:33:34 2014 -0700
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/stout/include/stout/svn.hpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6a778df0/3rdparty/libprocess/3rdparty/stout/include/stout/svn.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/svn.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/svn.hpp
index db0e7e2..117ab0a 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/svn.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/svn.hpp
@@ -90,10 +90,11 @@ inline Try<Diff> diff(const std::string& from, const std::string& to)
target.len = to.length();
svn_txdelta_stream_t* delta;
- svn_txdelta(
+ svn_txdelta2(
&delta,
svn_stream_from_string(&source, pool),
svn_stream_from_string(&target, pool),
+ false,
pool);
// Now we want to convert this text delta stream into an svndiff
@@ -103,11 +104,12 @@ inline Try<Diff> diff(const std::string& from, const std::string& to)
void* baton = NULL;
svn_stringbuf_t* diff = svn_stringbuf_create_ensure(1024, pool);
- svn_txdelta_to_svndiff2(
+ svn_txdelta_to_svndiff3(
&handler,
&baton,
svn_stream_from_stringbuf(diff, pool),
0,
+ SVN_DELTA_COMPRESSION_LEVEL_DEFAULT,
pool);
// Now feed the text delta to the handler.