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

merge and symbolic links

From: Mario Amaro <MAmaro_at_colbun.cl>
Date: 2005-01-19 16:13:24 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 file
'myfile' and one extra symbolic link 'mysymlink' that links to the file

If I checkout revision 1 and then update to revision 2 with the command

$ svn update

the symbolic link pops up OK.

The problem is this: I have a branched revision, say number 10. This
revision does not have the extra file nor the symbolic link.
I want to insert them in revision 10 so I type

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

and the command returns OK. I find that both files exist, but the file
'mysymlink' is not a symbolic link. Instead, it is a plain file whose
contents are 'link myfile'

I mean,

$ cat myfile
link myfile

Moreover, if I checkout revision 1 and then type

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

the same thing happens: No symbolic link but a plain file with the same

Is this a bug or is it intended behaviour?



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

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