E000021 on merge when replacing a symlink with a directory in subversion-1.7.2 on linux.

[Duncan Exon Smith <du...@gmail.com>]

subversion-1.7.2 gives an error when merging in a feature branch that
replaces a symlink with a directory on linux:

svn: E000021: Can't read file '/home/duncan/svn/co/trunk/symlink': Is a
directory

I tried using --reintegrate and also the equivalent traditional merge.  I
have a pretty small formula to reproduce this that I've included below.
 Please let me know whether I'm doing something wrong, or if I should go
ahead and post this to the issue tracker.

svnadmin create repo
svn co file://$PWD/repo co
# Checked out revision 0.
svn mkdir co/trunk
# A         co/trunk
svn mkdir co/trunk/directory
# A         co/trunk/directory
ln -s directory co/trunk/symlink
svn add co/trunk/symlink
# A         co/trunk/symlink
svn commit co/ -m 'Adding trunk.'
# Adding         co/trunk
# Adding         co/trunk/directory
# Adding         co/trunk/symlink
# Transmitting file data .
# Committed revision 1.
svn cp co/trunk/ co/branch
# A         co/branch
svn commit co/ -m Branching.
# Adding         co/branch
#
# Committed revision 2.
svn rm co/branch/symlink
# D         co/branch/symlink
svn cp co/branch/directory/ co/branch/symlink
# A         co/branch/symlink
svn commit co/ -m 'Replacing symlink with copy.'
# Replacing      co/branch/symlink
#
# Committed revision 3.
svn update co/trunk/
# Updating 'co/trunk':
# At revision 3.
svn merge --reintegrate '^/branch' co/trunk
# svn: E000021: Can't read file '/home/duncan/svn/co/trunk/symlink': Is a
directory

Re: E000021 on merge when replacing a symlink with a directory in subversion-1.7.2 on linux.

[Duncan Exon Smith <du...@gmail.com>]

On 11 January 2012 11:59, Philip Martin <ph...@wandisco.com> wrote:

> Duncan Exon Smith <du...@gmail.com> writes:
>
> >  Please let me know whether I'm doing something wrong, or if I should go
> > ahead and post this to the issue tracker.
>
> Yes, please raise an issue.


http://subversion.tigris.org/issues/show_bug.cgi?id=4096

Re: E000021 on merge when replacing a symlink with a directory in subversion-1.7.2 on linux.

[Philip Martin <ph...@wandisco.com>]

Duncan Exon Smith <du...@gmail.com> writes:

>  Please let me know whether I'm doing something wrong, or if I should go
> ahead and post this to the issue tracker.

Yes, please raise an issue.  A shorter recipe:

svnadmin create repo
svn co file://`pwd`/repo wc
svn mkdir wc/A
ln -s A wc/B
svn add wc/B
svn ci -mm wc
svn rm wc/B
svn mkdir wc/B
svn ci -mm wc
svn up -r1 wc
svn merge -c2 wc wc
../src/subversion/svn/util.c:913: (apr_err=21)
../src/subversion/libsvn_client/merge.c:10827: (apr_err=21)
../src/subversion/libsvn_client/merge.c:10791: (apr_err=21)
../src/subversion/libsvn_client/merge.c:10791: (apr_err=21)
../src/subversion/libsvn_client/merge.c:8972: (apr_err=21)
../src/subversion/libsvn_client/merge.c:8591: (apr_err=21)
../src/subversion/libsvn_client/merge.c:5052: (apr_err=21)
../src/subversion/libsvn_client/ra.c:248: (apr_err=21)
../src/subversion/libsvn_client/ra.c:248: (apr_err=21)
../src/subversion/libsvn_repos/reporter.c:1278: (apr_err=21)
../src/subversion/libsvn_repos/reporter.c:1214: (apr_err=21)
../src/subversion/libsvn_repos/reporter.c:902: (apr_err=21)
../src/subversion/libsvn_client/repos_diff.c:619: (apr_err=21)
../src/subversion/libsvn_client/repos_diff.c:511: (apr_err=21)
../src/subversion/libsvn_client/merge.c:2077: (apr_err=21)
../src/subversion/libsvn_client/merge.c:2007: (apr_err=21)
../src/subversion/libsvn_subr/io.c:3081: (apr_err=21)
svn: E000021: Can't read file '/home/pm/sw/subversion/obj/wc/B': Is a directory

-- 
Philip