Pavel Lyalyakin wrote on Mon, Dec 26, 2016 at 18:47:09 +0300:
> Hello Daniel,
>
> On Fri, Dec 23, 2016 at 11:14 PM, Daniel Shahaf <d...@daniel.shahaf.name>
> wrote:
> >
> > Pavel Lyalyakin wrote on Fri, Dec 23, 2016 at 22:31:02 +0300:
> > > Index: issue4129.txt
> > > ===================================================================
> > > --- issue4129.txt (revision 1775883)
> > > +++ issue4129.txt (working copy)
> > > @@ -12,6 +12,16 @@
> > > revision would be reported as belonging to the previous revision that
> > > touched
> > > the file being annotated.
> > >
> > > +Beginning with SVN 1.8.0, 'svnadmin verify' produces one of these errors
> > > in
> > > +case it detects this problem:
> > > +[[[
> > > +svnadmin: E160004: Mergeinfo-count discrepancy on
> > > '0-221.0.r64541/774830': expected 417247173744278003+0, counted 42834
> > > +]]]
> > > +
> > > +[[[
> > > +svnadmin: E160004: r1234's root node's predecessor is r1232 but should
> > > be r1233
> > > +]]]
> > > +
> >
> > There are several other error messages in libsvn_fs_fs that have
> > comments associating them with issue #4129, so I don't think the
> > text should imply that these two messages are the only possible
> > manifestations of issue #4129.
>
> It's definitely makes sense to include other relevant errors messages.
> I've originally specified only the errors that have been recently
> reported to users@ mailing list and the ones mentioned in docs. But
> what are those other messages?
>
> >From what I see now, there are 4 variants of messages `svnadmin
> verify` will produce when it encounters #4129:
>
> [[[
> svnadmin: E160004: Mergeinfo-count discrepancy on
> '0-221.0.r64541/774830': expected 417247173744278003+0, counted 42834
> ]]]
> [[[
> svnadmin: E160004: r1234's root node's predecessor is r1232 but should be
> r1233
> ]]]
> [[[
> svnadmin: E160004: Predecessor count mismatch: ARG has ARG, but ARG has ARG
> ]]]
> [[[
> svnadmin: E160004: Transaction TXN's root node's predecessor is rREV
> but should be rREV
> ]]]
>
> It is this list complete?
It's more complete. The following error may also be a symptom of #4129,
however, I'm not sure whether the failure mode of pre-1.7.5 could (even
in theory) cause it:
.
return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
"File node '%s' has inconsistent mergeinfo: "
"has_mergeinfo=%d, "
"mergeinfo_count=%" APR_INT64_T_FMT,
stringify_node(node, iterpool),
has_mergeinfo, mergeinfo_count);
There's also the error in validate_root_noderev(), however, that one is
not at 'verify' time but at commit time.
In the third error you quote, suggest to change "ARG" to "NODE-REVISION"
and "COUNT" respectively for readability, as you did in the fourth
error.
Cheers,
Daniel
