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

svn merge probles with branches and deleted directories

From: Greg Landrum <greg.landrum_at_gmail.com>
Date: 2006-05-23 17:29:22 CEST

The svn merge command seems to have problems with branches and deleted
directories: it reliably produces a "Working copy X is missing or not
locked" error.

Here's a very simple recipe demonstrating the problem:
svnadmin create /home/svn/Test
svn import trunk file:///home/svn/Test/trunk -m test
svn mkdir -m 'create' file:///home/svn/Test/branches
svn copy -m 'copy' file:///home/svn/Test/trunk file:///home/svn/Test/branches/b1
svn co file:///home/svn/Test/branches/b1 branch
svn remove branch/dirA
svn commit -m 'removed' branch
rm -rf trunk
svn co file:///home/svn/Test/trunk trunk
echo "foo" > trunk/dirA/file1.txt
svn commit -m 'update' trunk
mkdir trunk/dirA/dirA1
touch trunk/dirA/dirA1/file2
svn add trunk/dirA/dirA1
svn commit -m 'add a dir to a deleted dir' trunk
cd branch
svn merge -r 4:6 file:///home/svn/Test/trunk

The error message generated is:
svn: Working copy 'dirA' is missing or not locked

This was reported in early March as Issue 2515, and it has collected
17 votes (13 of which are not from me), but I haven't found any
discussion of the bug here (aside from the posting that triggered the
bug submission) and there have been no updates on the tracker. Since
this bug is almost a showstopper when the situation triggering it
arises (the work-around I have come up with -- merging the
subdirectories of the branch individually -- is both painful and time
consuming), I'm curious to find out if there are any plans to try and
fix it.

Thanks,
-greg

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 23 17:44:28 2006

This is an archived mail posted to the Subversion Dev mailing list.