You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ne...@apache.org on 2010/03/11 15:14:47 UTC
svn commit: r921857 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c
Author: neels
Date: Thu Mar 11 14:14:46 2010
New Revision: 921857
URL: http://svn.apache.org/viewvc?rev=921857&view=rev
Log:
Cosmetic.
* subversion/libsvn_wc/adm_ops.c
(svn_wc__get_pristine_contents): Clearly mark a code block TODO for 1.7.
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=921857&r1=921856&r2=921857&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Thu Mar 11 14:14:46 2010
@@ -2196,7 +2196,6 @@ svn_wc__get_pristine_contents(svn_stream
{
svn_wc__db_status_t status;
svn_wc__db_kind_t kind;
- const char *text_base;
SVN_ERR(svn_wc__db_read_info(&status, &kind,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -2255,14 +2254,16 @@ svn_wc__get_pristine_contents(svn_stream
&& status != svn_wc__db_status_obstructed_delete
&& status != svn_wc__db_status_base_deleted);
- /* ### TODO: use pristine store. */
-
- SVN_ERR(svn_wc__text_base_path(&text_base, db, local_abspath, FALSE,
- scratch_pool));
- SVN_ERR_ASSERT(text_base != NULL);
+ /* ### TODO 1.7: use pristine store instead of this block: */
+ {
+ const char *text_base;
+ SVN_ERR(svn_wc__text_base_path(&text_base, db, local_abspath, FALSE,
+ scratch_pool));
+ SVN_ERR_ASSERT(text_base != NULL);
- return svn_stream_open_readonly(contents, text_base, result_pool,
- scratch_pool);
+ return svn_stream_open_readonly(contents, text_base, result_pool,
+ scratch_pool);
+ }
}