can't merge diff that contains symlink to current directory

["Nathan A. Ferch" <nf...@marginal.net>]

i recently had a problem merging a changset that included a symlink to the
current directory.

here's a transcript of what happens:

largo[nf]pts/14 ~/tmp/svnbug 21878>sh -x ~/break-svn
++ pwd
+ mydir=/export/home/nf/tmp/svnbug
+ svnadmin create repos
+ svn co file:///export/home/nf/tmp/svnbug/repos wip
Checked out revision 0.
+ cd wip
+ svn mkdir a
A         a
+ cd a
+ ln -s there here
+ ls -la
total 12
drwxr-x---  3 nf nf 4096 Apr 26 17:06 .
drwxr-x---  4 nf nf 4096 Apr 26 17:06 ..
drwxr-x---  7 nf nf 4096 Apr 26 17:06 .svn
lrwxrwxrwx  1 nf nf    5 Apr 26 17:06 here -> there
+ svn add here
A         here
+ svn commit -m 'created symlink'
Adding         a
Adding         a/here
Transmitting file data .
Committed revision 1.
+ cd ..
+ svn cp a b
A         b
+ cd b
+ ls -la
total 12
drwxr-x---  3 nf nf 4096 Apr 26 17:07 .
drwxr-x---  5 nf nf 4096 Apr 26 17:07 ..
drwxr-x---  7 nf nf 4096 Apr 26 17:07 .svn
lrwxrwxrwx  1 nf nf    5 Apr 26 17:07 here -> there
+ rm here
+ ln -s . here
+ ls -la
total 12
drwxr-x---  3 nf nf 4096 Apr 26 17:07 .
drwxr-x---  5 nf nf 4096 Apr 26 17:07 ..
drwxr-x---  7 nf nf 4096 Apr 26 17:07 .svn
lrwxrwxrwx  1 nf nf    1 Apr 26 17:07 here -> .
+ svn commit -m 'changed symlink'
Adding         b
Sending        b/here
Transmitting file data .
Committed revision 2.
+ svn diff -r 1:2
Index: here
===================================================================
--- here        (.../a) (revision 1)
+++ here        (.../b) (revision 2)
@@ -1 +1 @@
-link there
\ No newline at end of file
+link .
\ No newline at end of file
+ cd ../a
+ svn update
At revision 2.
+ svn merge -r1:2 ../b
svn: Can't open file 'here': No such file or directory
+ ls -la
total 16
drwxr-x---  3 nf nf 4096 Apr 26 17:07 .
drwxr-x---  5 nf nf 4096 Apr 26 17:07 ..
drwxr-x---  7 nf nf 4096 Apr 26 17:07 .svn
lrwxrwxrwx  1 nf nf    5 Apr 26 17:06 here -> there
-rw-r-----  1 nf nf    6 Apr 26 17:07 here.tmp

i'm currently using debian and 1.2.3dfsg1-2bpo1 from backports.org. i tried to
backport 1.3.1-2 myself to no avail. can anyone confirm this breaks 1.3.1?

please include me in responses, i'm not subscribed to this list.
--
nathan a ferch
nf@marginal.net
"If he tries that again, shoot him." -Peck

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org