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/06/30 14:29:50 UTC
svn commit: r959282 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: julianfoad
Date: Wed Jun 30 12:29:50 2010
New Revision: 959282
URL: http://svn.apache.org/viewvc?rev=959282&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_pristine_get_path): Error if the pristine text does not exist.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=959282&r1=959281&r2=959282&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Jun 30 12:29:50 2010
@@ -2206,6 +2206,7 @@ svn_wc__db_pristine_get_path(const char
{
svn_wc__db_pdh_t *pdh;
const char *local_relpath;
+ svn_boolean_t present;
SVN_ERR_ASSERT(pristine_abspath != NULL);
SVN_ERR_ASSERT(svn_dirent_is_absolute(wri_abspath));
@@ -2224,7 +2225,12 @@ svn_wc__db_pristine_get_path(const char
scratch_pool, scratch_pool));
VERIFY_USABLE_PDH(pdh);
- /* ### should we look in the PRISTINE table for anything? */
+ SVN_ERR(svn_wc__db_pristine_check(&present, db, wri_abspath, sha1_checksum,
+ svn_wc__db_checkmode_usable,
+ scratch_pool));
+ if (! present)
+ return svn_error_createf(SVN_ERR_WC_DB_ERROR, NULL,
+ _("Pristine text not found"));
SVN_ERR(get_pristine_fname(pristine_abspath, pdh->wcroot->abspath,
sha1_checksum,