Author: futatuki
Date: Tue Mar 16 13:00:00 2021
New Revision: 1887721
URL: http://svn.apache.org/viewvc?rev=1887721&view=rev
Log:
On the 1.10.x-r1887704 branch:
Merge r1887704 from trunk, excluding the change on subversion/po/de.po,
because it does not have the target msgid of the change.
Modified:
subversion/branches/1.10.x-r1887704/ (props changed)
subversion/branches/1.10.x-r1887704/subversion/libsvn_fs_fs/verify.c
subversion/branches/1.10.x-r1887704/subversion/po/sv.po
Propchange: subversion/branches/1.10.x-r1887704/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1887704
Modified: subversion/branches/1.10.x-r1887704/subversion/libsvn_fs_fs/verify.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x-r1887704/subversion/libsvn_fs_fs/verify.c?rev=1887721&r1=1887720&r2=1887721&view=diff
==============================================================================
--- subversion/branches/1.10.x-r1887704/subversion/libsvn_fs_fs/verify.c
(original)
+++ subversion/branches/1.10.x-r1887704/subversion/libsvn_fs_fs/verify.c Tue
Mar 16 13:00:00 2021
@@ -691,17 +691,20 @@ compare_p2l_to_rev(svn_fs_t *fs,
* during later stages of the verification process. */
if ( (entry->type == SVN_FS_FS__ITEM_TYPE_CHANGES)
!= (entry->item.number == SVN_FS_FS__ITEM_INDEX_CHANGES))
- return svn_error_createf(SVN_ERR_FS_INDEX_CORRUPTION,
- NULL,
- _("p2l index entry for changes in"
- " revision r%ld is item"
- " %"APR_UINT64_T_FMT
- " of type %u at offset %s"),
- entry->item.revision,
- entry->item.number,
- (unsigned int)entry->type,
- apr_off_t_toa(pool, offset));
-
+ {
+ const char *num_str = apr_psprintf(pool,
+ "%" APR_UINT64_T_FMT,
+ entry->item.number);
+ return svn_error_createf(SVN_ERR_FS_INDEX_CORRUPTION,
+ NULL,
+ _("p2l index entry for changes in"
+ " revision r%ld is item %s"
+ " of type %u at offset %s"),
+ entry->item.revision,
+ num_str,
+ (unsigned int)entry->type,
+ apr_off_t_toa(pool, offset));
+ }
/* Check contents. */
if (entry->type == SVN_FS_FS__ITEM_TYPE_UNUSED)
{
Modified: subversion/branches/1.10.x-r1887704/subversion/po/sv.po
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x-r1887704/subversion/po/sv.po?rev=1887721&r1=1887720&r2=1887721&view=diff
==============================================================================
--- subversion/branches/1.10.x-r1887704/subversion/po/sv.po [UTF-8] (original)
+++ subversion/branches/1.10.x-r1887704/subversion/po/sv.po [UTF-8] Tue Mar 16
13:00:00 2021
@@ -6794,8 +6794,8 @@ msgstr "p2l-indexpost för revision r%ld
#: ../libsvn_fs_fs/verify.c:696
#, c-format
-msgid "p2l index entry for changes in revision r%ld is item %ld of type %d at
offset %s"
-msgstr "p2l-indexpost för ändringar i revision r%ld är objekt %ld av typ %d på
position %s"
+msgid "p2l index entry for changes in revision r%ld is item %s of type %u at
offset %s"
+msgstr "p2l-indexpost för ändringar i revision r%ld är objekt %s av typ %u på
position %s"
#: ../libsvn_fs_util/fs-util.c:164
msgid "Filesystem object has not been opened yet"
