You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Michael L Brown <mi...@philips.com> on 2005/06/20 19:49:47 UTC
svn merge didn't merge link file correctly
I created a branch from a branch in order to do merging of code from a CVS
repository that has changed since the SVN repository was created from the
CVS files.
But, one of the things I've done since the creation of the SVN tree is
create some symbolic links. Within the branch the "svn update" works
correctly such that working copies have the symbolically linked files
created correctly.
But, when I did a merge from the original branch to the special branch
(that will wither on the tree once the merge is done), the file that was a
symbolic link in the original branch turned into a file on the new branch,
four bytes larger.
The contents of the file is:
cat PinnacleStatic/bin/-sparc/libstdc++.so.5
It is really supposed to be:
lrwxrwxrwx 1 current code 18 Jun 14 16:01
PinnacleStatic/bin/-sparc/libstdc++.so.5 -> libstdc++.so.5.0.5
Why did the merge screw up? Is this a bug? I am not at SVN 1.2.
Thanks for any tips.
MB
--
Mike Brown (Michael.L.Brown@Philips.com)
Lotus Bloats: Michael L Brown/MSN/MS/PHILIPS
Philips/ADAC, Madison, WI
Desk: 608-288-6969 Fax: 608-298-2101
PMS direct: 164-6969
You design it, I'll build it!
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn merge didn't merge link file correctly
Posted by Brian Buesker <bb...@qualcomm.com>.
Michael L Brown wrote:
>I created a branch from a branch in order to do merging of code from a CVS
>repository that has changed since the SVN repository was created from the
>CVS files.
>
>But, one of the things I've done since the creation of the SVN tree is
>create some symbolic links. Within the branch the "svn update" works
>correctly such that working copies have the symbolically linked files
>created correctly.
>
>But, when I did a merge from the original branch to the special branch
>(that will wither on the tree once the merge is done), the file that was a
>symbolic link in the original branch turned into a file on the new branch,
>four bytes larger.
>
>The contents of the file is:
>
> cat PinnacleStatic/bin/-sparc/libstdc++.so.5
>
>It is really supposed to be:
>
> lrwxrwxrwx 1 current code 18 Jun 14 16:01
>PinnacleStatic/bin/-sparc/libstdc++.so.5 -> libstdc++.so.5.0.5
>
>Why did the merge screw up? Is this a bug? I am not at SVN 1.2.
>
>
This is a known bug that exists in the 1.1.x series, but is fixed in 1.2. Please see:
http://subversion.tigris.org/issues/show_bug.cgi?id=2064
Brian
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org