Carl Räihä <carl.raiha@frantic.com> writes:
> I added a symbolic link to trunk and wanted to merge it to a branch.
I can't reproduce this with the latest trunk Subversion, can you?
Here is the script I used:
#!/bin/sh
SVN=${HOME}/src/subversion/subversion/clients/cmdline/svn
SVNADMIN=${HOME}/src/subversion/subversion/svnadmin/svnadmin
# URL=http://localhost/SOMETHING/repos
# URL=svn://localhost/SOMETHING/repos
URL=file:///`pwd`/repos
rm -rf repos wc
${SVNADMIN} create repos
${SVN} co ${URL}/ wc
cd wc
# Add a regular file in r1.
touch foo
${SVN} add foo
${SVN} ci -m "Add regular file foo."
${SVN} up
# Add a symbolic link in r2.
ln -s foo link-to-foo
${SVN} add link-to-foo
${SVN} ci -m "Add symbol link to foo."
${SVN} up
# Go back to r1.
${SVN} up -r1
# Merge the creation of the symbolic link into the wc.
${SVN} merge -r1:2 .
# Demonstrate that the link came back.
echo ""
echo "'svn status -v' says:"
echo ""
${SVN} st -v
echo ""
echo "'ls -l' says:"
echo ""
ls -l
echo ""
Best,
-Karl
> 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
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 15 19:01:50 2005