On Wed, Jun 29, 2011 at 00:39, Greg Stein <gstein_at_gmail.com> wrote:
> On Tue, Jun 28, 2011 at 16:21, <ivan_at_apache.org> wrote:
>>...
>> +++ subversion/trunk/subversion/mod_dav_svn/reports/update.c Tue Jun 28 20:21:03 2011
>> @@ -353,8 +353,8 @@ add_helper(svn_boolean_t is_dir,
>> "copyfrom-path=\"%s\" copyfrom-rev=\"%ld\">"
>> DEBUG_CR,
>> DIR_OR_FILE(is_dir),
>> - bc_url, sha1_checksum_str,
>> - qname, qcopy, copyfrom_revision);
>> + bc_url, qname,
>> + sha1_checksum_str, qcopy, copyfrom_revision);
>> child->copyfrom = TRUE;
>
> I'm looking at this, and it still seems wrong. The context was lost,
> so here is the full code (before your change):
>
>
> elt = apr_psprintf(pool,
> "<S:add-%s name=\"%s\"%s%s "
> "copyfrom-path=\"%s\" copyfrom-rev=\"%ld\">"
> DEBUG_CR,
> DIR_OR_FILE(is_dir),
> bc_url, sha1_checksum_str,
> qname, qcopy, copyfrom_revision);
>
> It seems that qname should be first, then bc_url_str (note the _str!),
> and then sha1_checksum_str. Lastly, followed by qcopy and
> copyfrom_revision.
>
You're right as usual! I've fixed it in r1140833. It's interesting why
original bug wasn't detected by our test suite.
--
Ivan Zhakov
Received on 2011-06-28 22:50:52 CEST