On Mon, Jan 5, 2009 at 8:10 AM, Damien Deville
<damien.deville_at_netasq.com> wrote:
> Hi subversion devels,
>
> I think we found an issue in svn 1.5 mergeinfo
>
> Here is the description:
> - we have a repository using svn 1.5.5/1.5.4 for client and server side
> (server side was migrated to support mergeinfo)
> - we have one trunk and some branches
> - when wanting to merge one revision from trunk to another branch the
> following error appears:
>
> svn: Could not parse mergeinfo string ':netasq-bpf.c:25374'
> svn: Invalid revision number found parsing ':netasq-bpf.c:25374'
>
> we have some files with "::" in their names and some of them can be
> found in svn:mergeinfo property
>
> Here is an extract of the result of command "svn pg svn:mergeinfo
> --recursive ." on one of our branch
>
> contrib/isc-dhcp3-server/files/patch-common::netasq-bpf.c - /trunk/<some
> path>/contrib/isc-dhcp3-server/files/patch-common::netasq-bpf.c:25381
>
> Here is the error reported when trying to do a svn merge:
>
> svn: Could not parse mergeinfo string ':netasq-bpf.c:25368'
> svn: Invalid revision number found parsing ':netasq-bpf.c:25368'
>
> Attached to this email is a quick and dirty fix for parsing of path in
> mergeinfo for subversion 1.5.4 and 1.5.5.
>
> If you need extra information feel free to request them.
Hi Damien,
Thanks for the bug report. As Mike noted the attachment to your
original mail got devoured...No matter as this was a relatively simple
bug. I fixed this on trunk in r35040 and will nominate it for
backport to the 1.5.x branch as well.
Thanks again,
Paul
Received on 2009-01-06 16:32:57 CET