You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/11/29 14:08:33 UTC
svn commit: r1207858 - /subversion/trunk/subversion/libsvn_wc/workqueue.c
Author: rhuijben
Date: Tue Nov 29 13:08:33 2011
New Revision: 1207858
URL: http://svn.apache.org/viewvc?rev=1207858&view=rev
Log:
* subversion/libsvn_wc/workqueue.c
(run_file_install): Replace a commonly reported assertion with an just as
ugly error message that reports a bit more diagnostic information.
Modified:
subversion/trunk/subversion/libsvn_wc/workqueue.c
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1207858&r1=1207857&r2=1207858&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Tue Nov 29 13:08:33 2011
@@ -668,9 +668,24 @@ run_file_install(svn_wc__db_t *db,
local_relpath,
scratch_pool, scratch_pool));
}
+ else if (! checksum)
+ {
+ /* This error replaces a previous assertion. Reporting an error from here
+ leaves the workingqueue operation in place, so the working copy is
+ still broken!
+
+ But when we report this error the user at least knows what node has
+ this specific problem, so maybe we can find out why users see this
+ error */
+ return svn_error_createf(SVN_ERR_WC_CORRUPT_TEXT_BASE, NULL,
+ _("Can't install '%s' from pristine store, "
+ "because no checksum is recorded for this "
+ "file"),
+ svn_dirent_local_style(local_abspath,
+ scratch_pool));
+ }
else
{
- SVN_ERR_ASSERT(checksum != NULL);
SVN_ERR(svn_wc__db_pristine_get_future_path(&source_abspath,
wcroot_abspath,
checksum,