svn working copy * not locked

I'm trying to complete a large merge. The command I'm using is :

svn merge svn://path/to/branch/temp_windows_baselines/20031215
svn://path/to/branch/temp_windows_baselines/20040406 .

where my CWD is the root of a working copy of another branch.

First, Subversion fails after only partially completing the merge with the
message:

svn: Working copy 'devices/Component/build/visualc/product/blah' not locked

The one thing I notice is that "Component" is lower case in both of the
merge paths. This error message is very cryptic, shouldn't subversion
handle it somewhat cleaner? Also it leaves my working copy in an
inconsistent state since the merge was only partially completed. Is this a
known bug?

If I svn mv to correct the case naming above, a second (or similar) problem
occurs when I try a --dry-run of the same command. This fails with the
following message:

svn: 'path/to/another/component/mchms.dll' is not under version control

mchms.dll does not exist in the working copy or the from merge branch, but
does exist in the to merge branch. Shouldn't this file be added? Is there
a problem because it is a dll, or am I missing something else?

Thanks for your help,
brian

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Apr 13 15:56:47 2004