Paul Burba <ptbu...@gmail.com> writes:

> "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 don't think your test case is exactly the same bug since your
testcase affects both 1.6.x and 1.6.6 while the bug on the Subversion
repository doesn't affect 1.6.6.  Merging into the 1.6.x.source:

svn merge --reintegrate ^/subversion/branches/1.6.x-r40...@891008

the 1.6.x client gives an error:

svn: '/repos/asf/!svn/bc/875961/subversion/branches/1.6.x' path not found

and the 1.6.4 client doesn't:

--- Merging differences between repository URLs into '../src-1.6':
 G   ../src-1.6/CHANGES
 G   ../src-1.6

As I stated in a mail yesterday, the bug on the Subversion repository
is triggered by the mergeinfo paths not having a leading '/' in
addition to the other bogus data.  It doesn't happen with the old
collab repository where the paths do have a leading '/'.

Merging r892085 to 1.6.x produces a client that does the merge, so I
suppose we could simply approve r892085 and then there is definitely
no regression.

-- 
Philip

Reply via email to