Author: svn-role
Date: Sun Mar 27 14:53:27 2022
New Revision: 1899241
URL: http://svn.apache.org/viewvc?rev=1899241&view=rev
Log:
Merge r1887704 from trunk:
* r1887704
Follow up to r1865987, r1866588: Unbreak a msgid.
Justification:
subversion.pot should be built correctly.
Votes:
+1: futatuki, jun66j5, markphip
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_fs_fs/ (props changed)
subversion/branches/1.14.x/subversion/libsvn_fs_fs/verify.c
subversion/branches/1.14.x/subversion/po/de.po
subversion/branches/1.14.x/subversion/po/sv.po
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1887704
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899241&r1=1899240&r2=1899241&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sun Mar 27 14:53:27 2022
@@ -108,13 +108,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1887704
- Follow up to r1865987, r1866588: Unbreak a msgid.
- Justification:
- subversion.pot should be built correctly.
- Votes:
- +1: futatuki, jun66j5, markphip
-
* r1891908
Fix a bug where «make davautocheck» immediately after configure failed
hard because of an unbuilt dependency.
Propchange: subversion/branches/1.14.x/subversion/libsvn_fs_fs/
------------------------------------------------------------------------------
Merged /subversion/trunk/subversion/libsvn_fs_fs:r1887704
Modified: subversion/branches/1.14.x/subversion/libsvn_fs_fs/verify.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_fs_fs/verify.c?rev=1899241&r1=1899240&r2=1899241&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/libsvn_fs_fs/verify.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_fs_fs/verify.c Sun Mar 27
14:53:27 2022
@@ -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.14.x/subversion/po/de.po
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/po/de.po?rev=1899241&r1=1899240&r2=1899241&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/po/de.po [UTF-8] (original)
+++ subversion/branches/1.14.x/subversion/po/de.po [UTF-8] Sun Mar 27 14:53:27
2022
@@ -6562,7 +6562,7 @@ msgstr "P2L-Indexeintrag für Revision r
#: ../libsvn_fs_fs/verify.c:696
#, fuzzy, c-format
-msgid "p2l index entry for changes in revision r%ld is item %ld of type %d at
offset %s"
+msgid "p2l index entry for changes in revision r%ld is item %s of type %u at
offset %s"
msgstr "P2L-Indexeintrag für Revision r%ld ist nicht zusammenhängend zwischen
Offsets %s und %s"
#: ../libsvn_fs_util/fs-util.c:164
Modified: subversion/branches/1.14.x/subversion/po/sv.po
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/po/sv.po?rev=1899241&r1=1899240&r2=1899241&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/po/sv.po [UTF-8] (original)
+++ subversion/branches/1.14.x/subversion/po/sv.po [UTF-8] Sun Mar 27 14:53:27
2022
@@ -6854,8 +6854,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"
