Dear "Users",
It seems that on svn 1.7.1 deleted symbolic links on a branch cause a
tree conflict when a -reintegrate merge is done back to trunk.
The same merge done with svn 1.6.17 smoothly passes as a normal
deletion.
See below a simple "script" to replicate the bug:
# svn, version 1.7.1 (r1186859)
REPO=${HOME}/TestRepo
svnadmin create $REPO
svn mkdir -m "init" file://$REPO/trunk file://$REPO/branches
svn co file://$REPO wc
touch wc/trunk/file
ln -s file wc/trunk/link
svn add wc/trunk/file wc/trunk/link
svn ci -m "link" wc
svn cp -m "branch 1.0" file://$REPO/trunk file://$REPO/branches/1.0
svn up wc
svn rm wc/branches/1.0/link
svn ci -m "rm link" wc
svn merge --reintegrate ^/branches/1.0 wc/trunk
--- Merging differences between repository URLs into 'wc/trunk':
C wc/trunk/link
--- Recording mergeinfo for merge between repository URLs into
'wc/trunk':
U wc/trunk
Summary of conflicts:
Tree conflicts: 1
The same when executed with svn, version 1.6.17 (r1128011)
#Only the last command differs
svn merge --reintegrate ^/branches/1.0 wc/trunk
--- Merging differences between repository URLs into 'wc/trunk':
D wc/trunk/link
Is this really a bug? Or am I doing something wrong?
Regards
Christian Asmussen
Visit our website at http://www.ubs.com
This message contains confidential information and is intended only
for the individual named. If you are not the named addressee you
should not disseminate, distribute or copy this e-mail. Please
notify the sender immediately by e-mail if you have received this
e-mail by mistake and delete this e-mail from your system.
E-mails are not encrypted and cannot be guaranteed to be secure or
error-free as information could be intercepted, corrupted, lost,
destroyed, arrive late or incomplete, or contain viruses. The sender
therefore does not accept liability for any errors or omissions in the
contents of this message which arise as a result of e-mail transmission.
If verification is required please request a hard-copy version. This
message is provided for informational purposes and should not be
construed as a solicitation or offer to buy or sell any securities
or related financial instruments.
UBS reserves the right to retain all messages. Messages are protected
and accessed only in legally justified cases.
