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

Re: Bug merging a symlink that used to be a file

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-09-19 21:20:09 CEST

On 9/15/06, Angela Marie Thomas <athomas@barracudanetworks.com> wrote:
> I found a bug when merging a symlink that used to be a file. The
> scenario is as follows:
> branch regular file from trunk
> edit file on branch and commit
> remove file on trunk and commit
> add file back to trunk as symlink and commit
> merge branch to trunk
> get error
> svn: '.svn/tmp/tempfile.3.tmp' has unsupported special file type 'content'
> ['content' is the first word in the original trunk revision of the file]
> update
> get error that working copy locked
> run 'svn cleanup'
> get same "unsupported special file type" error again
> In our real-life scenario, the merge aborts when it gets to that file so
> you don't get the option of dealing with that conflict in any graceful way.
> This bug looks similar to the problem reported in bug 2530, but that bug
> generated a different error message and is not reproducible in 1.4.0.
> My bug was found in 1.1.3 and still exists in 1.4.0. The script to
> reproduce my bug is below. It's a modified version of the script
> submitted for bug 2530. A typescript session of the below is also available
> at http://paste.lisp.org/display/26072.
> I don't know what the right thing is for Subversion to do with this type
> of conflict. However, the merge should not abort and the working copy
> should not get wedged.

Yeah, this is another variant on 2530 (which basically should just be
called "merge and symlinks don't play nice together"). I'll commit
some XFail tests for the two problems soon, and will play around and
see what I can come up with as far as fixing the issue.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 19 21:20:25 2006

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

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