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

Re: Merge command failed with "missing or not locked"

From: Bob Peterson <bob_at_memento-inc.com>
Date: 2005-12-19 15:50:02 CET

I just guessing here, without trying it in a dummy repository...

svn mkdir http://<repository>/src/trunk/Problem
<populate Problem folder>
<make changes in trunk>
svn mkdir http://<repository>/src/branches/oak
# Branch only the top level folders which I need:
svn copy http://<repository>/src/trunk/A
http://<repository>/src/branches/oak
svn copy http://<repository>/src/trunk/B
http://<repository>/src/branches/oak
svn copy http://<repository>/src/trunk/C
http://<repository>/src/branches/oak
<make changes in branch/oak, merge back to trunk>
<repository is now at revision N>
<make changes in trunk>
cd oak
svn merge -r <N>:HEAD http://<repository>/src/trunk

Thanks,
\bob

Ryan Schmidt wrote:

> On Dec 19, 2005, at 15:21, Bob Peterson wrote:
>
>> I got no anwers so I'll try asking more simply... Why would I get a
>> message
>> svn: Working copy 'bob/Search' is missing or not locked
>> when I do a merge from trunk into my branch working copy? That is a
>> folder I never copied into the branch, so why wouldn't it skip it?
>>
>> By the way, I can reproduce this on my UNIX system, too, using
>> command line svn. So TortoiseSVN is definitely out of the picture.
>
>
> Can you show us the reproduction recipe?
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 19 16:08:17 2005

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