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

svn merge produces Working copy 'wc1/branch/dir1' not locked error.

From: Panagiotis Korros <panagiotis.korros_at_gmail.com>
Date: 2005-01-05 00:32:36 CET

I am trying to merge some changes made into the trunk to a branch.
When I do that I get the following error:
svn: Working copy 'wc1/branch/dir1' not locked

To repro the error try the following script:

svnadmin create repo
svn co file:///c:/test/repo wc1

mkdir wc1\trunk
svn add wc1\trunk
svn commit -m "create trunk" wc1

svn copy wc1\trunk wc1\branch
svn commit -m "create branch" wc1

mkdir wc1\trunk\dir1
dir > wc1\trunk\dir1\file.txt
svn add wc1\trunk\dir1
svn commit -m "add file" wc1

mkdir wc1\trunk\dir1\dir2
dir > wc1\trunk\dir1\dir2\file.txt
svn add wc1\trunk\dir1\dir2
svn commit -m "add another file" wc1

svn merge -r3:4 wc1\trunk wc1\branch

The error is caused because the dir1 directory doesn't exist in the
branch. What I am trying to do is to merge r4 without merging r3.
I think that subversion should create dir1 when I try to merge r4.

I am using subversion 1.1.2 on windows xp sp1.

-- 
Take back the web http://www.getfirefox.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 5 03:24:08 2005

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