Paul Burba <ptburba_at_gmail.com> writes:
> Hyrum ran into a problem when reintegrating a branch back to 1.6.x
> using the (at the time) latest 1.6.x client. Here is the merge he did
> (though this has a pegged source because the backport branch was
> deleted):
>
> 1.6.x.>svn merge ^^/subversion/branches/1.6.x-r40452_at_891008 . --reintegrate
> ..\..\..\subversion\libsvn_ra_neon\util.c:546: (apr_err=160013)
> svn: '/repos/asf/!svn/bc/875961/subversion/branches/1.6.x' path not found
>
> Unfortunately this reintegrate works with 1.6.6, so we have a regression.
>
> I've traced the cause to r890993 (Reintegrate the 1.6.x-r889840
> branch) which was my attempt to address the myriad of problems caused
> by issue #3547 http://subversion.tigris.org/issues/show_bug.cgi?id=3547,
> which converted all the mergeinfo in our repository from absolute to
> relative merge source paths when we loaded it into the ASF repos. I
> haven't been able to fix the reintegrate problem Hyrum encountered,
> heck it's not exactly clear to me what is going wrong, but I'm working
> on it.
As one who voted for r890993 I wouldn't object if it was reverted and
we released without it. It is a change in behaviour, so I guess that
counts as a regression, but what seems to be happening is that the old
code ignores some of the incorrect mergeinfo because the paths don't
match. It's possible that the new behaviour, getting an error when
the mergeinfo is broken, is better.
--
Philip
Received on 2009-12-17 14:49:16 CET