Sorry for the missing version information! D'oh. Clients are svn 1.0.0 on
ydl 2.3, server is svn 1.0.1 (r1) on redhat 9.
Here is the output leading up to the problem:
D devices/gps/source/product/EGRMsgCounter.h
D devices/gps/source/product/Tipy.h
D devices/gps/source/product/TimeOutAlarms.h
C devices/gps/interface/GPS_impl.h
D devices/gps/interface/StdAfx.h
D devices/gps/interface/StdAfx.cpp
Skipped missing target:
'devices/HomingLogicalIndicator/build/visualc/product/HomingLogicalIndicator
Server/HomingLogicalIndicatorServer.plg'
Skipped missing target:
'devices/HomingLogicalIndicator/build/visualc/product/HomingLogicalIndicator
Server/HomingLogicalIndicatorServer.dsp'
svn: Working copy
'devices/HomingLogicalIndicator/build/visualc/product/HomingLogicalIndicator
Server' not locked
I see many "skipped missing target" messages, which i understood to be
missing in my working copy (and it's not critical that they are there
anyway).
Inconsistent state meant (to me) that the merge is partially completed and
so I don't match a specific revision anymore. Thanks for the tip to get get
back to a single revision.
As to your last point, that's exactly it. I'm trying to merge the changes
from two versions of source code (think of them as vendor branches) into a
third branch. It appears like this is going to require more effort than a
simple merge. I'm now realising the usefulness of the --dry-run option.
Another characteristic I'm noticing now is that during my dry-run merge, the
svn client uses 98% and about 10 mins of CPU time (from top) processing a
single file. I thought the process had hung, but it actually makes it past
this after 10 or so minutes. Memory usage does not go up during this
time. No other file uses nearly this much CPU. Is this a known bug?
brian
-----Original Message-----
From: Ben Collins-Sussman [mailto:sussman@collab.net]
Sent: Tuesday, April 13, 2004 10:16 AM
To: fallik@assurtech.com
Cc: users@subversion.tigris.org
Subject: Re: svn working copy * not locked
On Tue, 2004-04-13 at 08:56, Brian Fallik wrote:
> 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
>
What client OS? What server OS? What client version? What server
version?
We need more information. What's 'svn merge' trying to do in that
directory? Can you show us an actual transcript of the merge operation?
> The one thing I notice is that "Component" is lower case in both of the
> merge paths.
Then why is it upper-case in the working copy? That might very well be
the problem.
> This error message is very cryptic, shouldn't subversion
> handle it somewhat cleaner?
Typically that error message means: "you asked me to change something
in a path that doesn't exist in the WC."
> Also it leaves my working copy in an
> inconsistent state since the merge was only partially completed.
What does 'inconsistent state' mean? If 'svn status' shows (L)ocked
directories, just run 'svn cleanup'. If you have only half a merge
applied, then just 'svn revert -R' the local mods, delete any
unversioned stuff left behind, and try the merge again.
One last side question: it looks like you're comparing the latest
version of two different branches. Are you sure that's what you really
mean to do? Typically a merge operation compares two different
revisions of the *same* branch (i.e. beginning and HEAD). Comparing the
HEAD of two different branches often results in a patch that doesn't
apply cleanly.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Apr 13 16:33:37 2004