On Thu, Dec 17, 2009 at 5:53 PM, Branko Čibej <brane_at_xbc.nu> wrote:
> Paul Burba wrote:
>> Regardless, I don't think this is a true regression, just a
>> new bug, and as such, not something that should hold up 1.6.7.
>>
>
> Sorry, what? Subversion will suddenly error out where it previously did
> not. No matter /how/ that mergeinfo got into the repository, if we don't
> fix this before releasing 1.6.7, we'll likely get a whole bunch of error
> reports. Telling people that "it's not really a bug" isn't going to be
> very productive, given that it effectively stops them from using svn
> merge in this situation.
>
> Can you be sure that the circumstances that lead to this error are rare
> enough to address in 1.6.8?
Hi Brane,
I haven't explained this clearly, sorry. What has happened here is a
semi-complicated dance among several issues.
Let me try to explain again:
The reintegrate bug Hyrum encountered is not IMO a regression because
it *only* worked in 1.6.6 because another bug hid it.
That other bug is issue #3547, which converted all the mergeinfo in
our repository from absolute paths to relative paths. The mergeinfo
APIs don't expect relative source paths in mergeinfo, so when it is
encountered the results are unpredictable (and usually wrong).
In r890993 I made fixes so the relative pathed mergeinfo are
interpreted as absolute, and so the various svn_mergeinfo_* APIs don't
choke on the relative paths. This was nominated and backported to
1.6.7.
Along comes Hyrum, who, using the latest 1.6.7 with r890993 included,
tries to reintegrate a backport branch to 1.6.x. It fails, a bug!
I try the same merge with 1.6.6 and it works. Regression right?
Actually no. It only worked because without the r890993 fix, the
relative pathed mergeinfo caused by issue #3547 was essentially
invisible to 1.6.6. It was just dumb luck that it actually
*prevented* an error. It most cases it would cause errors, as we
discussed here: http://svn.haxx.se/dev/archive-2009-12/0222.shtml.
~~~~~
This may all be moot because I fixed the bug in r892085 and nominated
this for backport to 1.6.7. I also nominated a test which reproduces
the bug Hyrum found. This test fails across the board on trunk,
1.6.x, and 1.6.6 without the the r892085 fix in place.
I hope that makes things clearer. If not let me know or ping me in
IRC tomorrow.
Thanks,
Paul
Received on 2009-12-18 03:20:25 CET