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

merging a link broken?

From: <bfc0713_at_verizon.net>
Date: 2007-12-04 22:42:48 CET

This seems like very basic brokedness, so I hope I'm missing something.
Using 1.4.3, but will upgrade if it can help.

In the trunk, have a directory with a file and a link
        L -> A

In one changeset, remove A, add B, and modify softlink to point at B

        L -> B

svn ci ...;
D A
A B
M L

Now try merging that changeset to a branch and you get an error about
the link-name not existing. It's as though it does the deletion
first in the merge, then tries the modify on the link, but tries
to access the *real* file and falls over. The new file isn't added
during the failed merge.

The link does have svn:special set to * for the link.

How do people deal with this?

TIA!

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 4 22:47:01 2007

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.