Re: conflicted link

On Fri, Jan 18, 2008 at 01:10:51PM -0500, Brandon Chubb wrote:
> % svn merge -c 8 $REPO/trunk .
> Skipped missing target: 'testfile'
> A testfile2
> svn: In directory '.'
> svn: '.svn/tmp/tempfile.3.tmp' has unsupported special file type '<<<<<<<'

Can you provide a shell script that reproduces this reliably?

> I have to then remove the .tmp file before doing a cleanup and revert.
> The testlink.{merge-left*,merge-right*} links are setup as you would
> expect, and there's a testlink.working that is a copy of the old
> target of the link.
>
> I was testing a fix for
> http://subversion.tigris.org/issues/show_bug.cgi?id=3051
> when I hit this

Which fix for issue #3051 were you testing? Do you have one?

-- 
Stefan Sperling <stsp_at_elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner