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

svn merge creates symbolic links as text files

From: Carl Räihä <carl.raiha_at_frantic.com>
Date: 2005-02-11 09:07:51 CET

Hi,

I added a symbolic link to trunk and wanted to merge it to a branch.

Here is what I'we done in the branch:

# First i looked for the changes since the branch was created.
$ svn diff -r 3154:HEAD REPOS/trunk
Index: vote
===================================================================
--- vote (revision 0)
+++ vote (revision 3156)
@@ -0,0 +1 @@
+link lib/vote
\ No newline at end of file

Property changes on: vote
___________________________________________________________________
Name: svn:special
   + *

# Ok there vas a symbolic link added.
# Lets merge it to the branch.
$ svn merge -r 3154:HEAD REPOS/trunk
A vote

# Seem ok, but!
$ svn st vote
~ + vote

# Something is strange. vote should be a symbolic link
# but it's actually a text file.
$ ls -l
-rw-rw-r-- 1 calle frantic 13 Feb 11 09:40 vote
$ more vote
link lib/vote
$ svn proplist vote
Properties on 'vote':
  svn:special

# It's a file containing the text "link lib/vote".
# It should link to lib/vote so thats correct but it should be a
# link and not a file.

The bug is that svn merge doesn't create symbolic links, it creates
textfiles instead.

I'm using svn, version 1.1.3 (r12730) compiled Feb 9 2005, 15:07:30 on
a Redhat Linux with kernel 2.4.21-27.EL.

Best Regards,
        Carl Räihä

-- 
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Carl Räihä                 carl.raiha@frantic.com
Senior Software Developer           Frantic Media
Arabianranta 6            Tel    +358 9 6220 400
FIN-00560 Helsinki        Direct +358 9 6220 4037
Finland                   Fax    +358 9 6220 4040
www.frantic.com           GSM    +358 40 704 5957
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 15 18:15:35 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.