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

Re: conflicted link

From: <bfc0713_at_verizon.net>
Date: Sun, 20 Jan 2008 02:48:58 -0500 (EST)

Thanks for replying Stefan,

On Sat, 19 Jan 2008, Stefan Sperling wrote:
> 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?

Sure, see below..

> > 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?

I've got one that works for the basic case, but since this is the
first time I've touched svn code, I should review svn/apr routines
instead of using standard C stuff, probably revisit any allocation
things I've done, and get someone more knowledgable to look it
over. (Not that it's that big a patch.)

This assumes a fresh repo, but if not, see the "makes R4" line
and use the same thing on the final merge. Here again, I don't
know what normal "recipes" look like. It's not a bright thing
for the user to do perhaps, but I'm carefully avoiding the #3051
bug buy not removing old link targets, which makes it look less

mkdir linktest
cd linktest
svn co svn://localhost/linkrepo .
mkdir trunk branches
svn add trunk branches
svn ci -m "start trunk,branches" .
svn switch svn://localhost/linkrepo/trunk
echo "test" > testfile1
ln -s testfile1 testlink
svn add testfile1 testlink
svn ci -m "add test file and link" .
svn cp -m "start branch" svn://localhost/linkrepo/trunk svn://localhost/linkrepo/branches/10
echo "more testing" > testfile2
ln -sf testfile2 testlink
svn add testfile2
svn ci -m "update link" . # makes R4
svn switch svn://localhost/linkrepo/branches/10
echo "yet more testing" > testfile3
svn add testfile3
ln -s testfile3 testlink
svn ci -m "update link in branch" .
svn merge -c 4 svn://localhost/linkrepo/trunk .

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-20 08:51:17 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.