You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/05/10 18:57:43 UTC
svn commit: r942820 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c
Author: julianfoad
Date: Mon May 10 16:57:42 2010
New Revision: 942820
URL: http://svn.apache.org/viewvc?rev=942820&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c
(svn_wc__get_pristine_contents): Replace a call to
svn_wc__get_revert_contents() with in-line simple code to make way
for upcoming changes to the latter function.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=942820&r1=942819&r2=942820&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Mon May 10 16:57:42 2010
@@ -2388,10 +2388,10 @@ svn_wc__get_pristine_contents(svn_stream
svn_error_clear(err);
- return svn_error_return(svn_wc__get_revert_contents(contents,
- db, local_abspath,
- result_pool,
- scratch_pool));
+ SVN_ERR(svn_wc__text_revert_path(&text_base, db, local_abspath,
+ scratch_pool));
+ return svn_stream_open_readonly(contents, text_base,
+ result_pool, scratch_pool);
}
return SVN_NO_ERROR;
}
Re: svn commit: r942820 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c
Posted by Greg Stein <gs...@gmail.com>.
On Mon, May 10, 2010 at 12:57, <ju...@apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Mon May 10 16:57:42 2010
> @@ -2388,10 +2388,10 @@ svn_wc__get_pristine_contents(svn_stream
>
> svn_error_clear(err);
>
> - return svn_error_return(svn_wc__get_revert_contents(contents,
> - db, local_abspath,
> - result_pool,
> - scratch_pool));
> + SVN_ERR(svn_wc__text_revert_path(&text_base, db, local_abspath,
> + scratch_pool));
> + return svn_stream_open_readonly(contents, text_base,
> + result_pool, scratch_pool);
svn_error_return ?