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

conflicted link

From: Brandon Chubb <bfc_at_fenway.our.net>
Date: Fri, 18 Jan 2008 13:10:51 -0500 (EST)

If do a merge of a link and get a conflict, what's the correct
behavior? Seems like it wouldn't make sense to do any conflict
marking like with a regular file.

In my case I only care about a real softlink on a real OS (that supports
such a thing) -- not a regular file with some "link somefile" text
to fill in for real link support.

I find that what happens looks like this:

% 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 '<<<<<<<'

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
when I hit this -- that bug is fairly basic breakage when trying to
merge changes to a link.

(I confirmed the bad .tmp file behavior with both a 1.4.2 and 1.4.3 client
and 1.4.3 server.)


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-18 23:21:24 CET

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

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