You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by er...@swapsimple.com on 2005/05/05 22:05:13 UTC
merge and symlink problem (issue 2064?)
I just ran into a problem with merging a symlink where I got a message
saying that the symlink "has unexpectedly changed special status".
I searched through the mailing lists for a bit, which eventually
pointed me over to bug #2064. That seems to describe exactly the
problem I'm seeing. It also claims that the problem is fixed in r12025.
I'm using:
> svn --version
svn, version 1.1.4 (r13838)
compiled May 5 2005, 21:30:38
huh? So is it fixed or isn't it?
One thing that I didn't see mentioned anywhere is the workaround:
I was able to manually create the symlink (based on exactly what
is in the file that was where the symlink should have been) and it
seemed to work.
eric
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: merge and symlink problem (issue 2064?)
Posted by er...@swapsimple.com.
On Thu, May 05, 2005 at 03:39:12PM -0700, Brian Buesker wrote:
> erh@swapsimple.com wrote:
> >huh? So is it fixed or isn't it?
> >
> I believe it is only fixed in the 1.2.x branch as the fix required some
> API changes.
oops. Guess I should have read the whole bug. Thanks for pointing that
out.
eric
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: merge and symlink problem (issue 2064?)
Posted by Ben Collins-Sussman <su...@collab.net>.
On May 5, 2005, at 5:39 PM, Brian Buesker wrote:
> erh@swapsimple.com wrote:
>
>> I just ran into a problem with merging a symlink where I got a
>> message
>> saying that the symlink "has unexpectedly changed special status".
>> I searched through the mailing lists for a bit, which eventually
>> pointed me over to bug #2064. That seems to describe exactly the
>> problem I'm seeing. It also claims that the problem is fixed in
>> r12025.
>> I'm using:
>>
>>> svn --version
>>>
>> svn, version 1.1.4 (r13838)
>> compiled May 5 2005, 21:30:38
>>
>> huh? So is it fixed or isn't it?
>>
> I believe it is only fixed in the 1.2.x branch as the fix required
> some API changes.
>
>
Yes, see the CHANGES file, line 29:
http://svn.collab.net/repos/svn/trunk/CHANGES
The fix is in 1.2.0.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: merge and symlink problem (issue 2064?)
Posted by Brian Buesker <bb...@qualcomm.com>.
erh@swapsimple.com wrote:
> I just ran into a problem with merging a symlink where I got a message
>saying that the symlink "has unexpectedly changed special status".
> I searched through the mailing lists for a bit, which eventually
>pointed me over to bug #2064. That seems to describe exactly the
>problem I'm seeing. It also claims that the problem is fixed in r12025.
>I'm using:
>
>
>>svn --version
>>
>>
>svn, version 1.1.4 (r13838)
> compiled May 5 2005, 21:30:38
>
>huh? So is it fixed or isn't it?
>
>
I believe it is only fixed in the 1.2.x branch as the fix required some
API changes.
>One thing that I didn't see mentioned anywhere is the workaround:
> I was able to manually create the symlink (based on exactly what
>is in the file that was where the symlink should have been) and it
>seemed to work.
>
>
Yep, that's exactly the workaround I am using as well.
Brian
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org