You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/03/20 17:49:05 UTC
svn commit: r1302992 - in /subversion/branches/1.6.x-issue4129: ./
subversion/libsvn_fs_fs/fs_fs.c
Author: stsp
Date: Tue Mar 20 16:49:05 2012
New Revision: 1302992
URL: http://svn.apache.org/viewvc?rev=1302992&view=rev
Log:
On the 1.6.x-issue4129 branch, merge r1294470 from trunk.
Suggested by: danielsh
Modified:
subversion/branches/1.6.x-issue4129/ (props changed)
subversion/branches/1.6.x-issue4129/subversion/libsvn_fs_fs/fs_fs.c
Propchange: subversion/branches/1.6.x-issue4129/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1294470
Modified: subversion/branches/1.6.x-issue4129/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue4129/subversion/libsvn_fs_fs/fs_fs.c?rev=1302992&r1=1302991&r2=1302992&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue4129/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.6.x-issue4129/subversion/libsvn_fs_fs/fs_fs.c Tue Mar 20 16:49:05 2012
@@ -5394,8 +5394,11 @@ validate_root_noderev(svn_fs_t *fs,
return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
_("predecessor count for "
"the root node-revision is wrong: "
- "found %d, committing r%ld"),
- root_noderev->predecessor_count, rev);
+ "found (%d+%ld != %d), committing r%ld"),
+ head_predecessor_count,
+ rev - head_revnum, /* This is equal to 1. */
+ root_noderev->predecessor_count,
+ rev);
}
return SVN_NO_ERROR;