Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: Bug related to : or :: in filename in svn:mergeinfo

subversion
Discussion topic

Back to topic list

Re: Bug related to : or :: in filename in svn:mergeinfo

Author Daniel Shahaf <d dot s at daniel dot shahaf dot name>
Full name Daniel Shahaf <d dot s at daniel dot shahaf dot name>
Date 2009-01-06 07:39:42 PST
Message C. Michael Pilato wrote on Tue, 6 Jan 2009 at 10:24 -0500:
> Damien Deville 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-se​rver/files/patch-com​mon::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.
> >
> > Thanks in advance,
> > Damien Deville
>
> Damien, I think that your attachment got eaten by our mail system on
> Tigris.org. (It's a long story...) Are you able to repost your changes
> inline as opposed to an attachment?
>
>
>

Another workaround is described here:
http://permalink.gma​ne.org/gmane.comp.ve​rsion-control.subver​sion.devel/107679

Daniel
(who's not going to waste any more time saying what he thinks of mail
systems that ... erhm, bye.)

« Previous message in topic | 3 of 4 | Next message in topic »

Messages

Show all messages in topic

Bug related to : or :: in filename in svn:mergeinfo Damien Deville <damien dot deville at netasq dot com> Damien Deville <damien dot deville at netasq dot com> 2009-01-05 05:10:37 PST
     Re: Bug related to : or :: in filename in svn:mergeinfo cmpilato C. Michael Pilato 2009-01-06 07:24:51 PST
         Re: Bug related to : or :: in filename in svn:mergeinfo Daniel Shahaf <d dot s at daniel dot shahaf dot name> Daniel Shahaf <d dot s at daniel dot shahaf dot name> 2009-01-06 07:39:42 PST
     Re: Bug related to : or :: in filename in svn:mergeinfo "Paul Burba" <ptburba at gmail dot com> "Paul Burba" <ptburba at gmail dot com> 2009-01-06 07:32:20 PST
Messages per page: