[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

merge and link

From: Mario Amaro <MAmaro_at_colbun.cl>
Date: 2005-01-18 23:35:27 CET

I am working on redhat linux 9.0 and subversion 1.1.3 and I have the
following problem:
I have two consecutive revisions: 1 and 2.
The only difference between them is that revision 2 has one extra valid
symbolic link named 'mysymlink' that links to a file named 'myfile'
If I checkout revision 1 and the update to revision 2 the symbolic link pops
up OK.
The problem is this: I have revision 10. This revision does not have the
extra symbolic link.
I want to insert it in revision 10 so I type

svn merge -r1:2 file:///path/to/repos .

and the command returns OK, but then I find out that the file 'mysymlink'
exists but it is not a symbolic link. Instead, it is a plain file whose
contents are 'link anotherfile'
I mean:
> cat myfile
link anotherfile
>

Is this a bug or is it intended behaviour?

Regards,

Mario

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 19 19:40:14 2005

This is an archived mail posted to the Subversion Users mailing list.