Working area problem after failed merge

[Jack Ivey <iv...@altair.com>]

Hi all,
I was trying to merge changes from a branch.  The merge failed 
because I was merging from the wrong directory.  The next operation
I did (another attempted merge?) I got an error message that svn 
couldn't lock the working area.  (Sorry about the paraphrases, I
was using Tortoise).

Next I switched to command line, thus:

C:\software\unity\trunk>svn cleanup
svn: Write-lock stolen in 'core/modules/udb/kernel/bindings'

C:\software\unity\trunk>svn cleanup
svn: Can't open directory 'core/modules/udb/kernel/bindings/.svn/tmp': The
system cannot find the path specified.

C:\software\unity\trunk>svn up
svn: Working copy '.' locked
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)

C:\software\unity\trunk>svn cleanup
svn: Can't open directory 'core/modules/udb/kernel/bindings/.svn/tmp': The
system cannot find the path specified.

Am I doing something stupid?  How should I be recovering from this?

Thanks,
Jack


Server: 1.0.1 Linux
Client: 1.0.1 XP


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Working area problem after failed merge

[Philip Martin <ph...@codematters.co.uk>]

Jack Ivey <iv...@altair.com> writes:

> C:\software\unity\trunk>svn cleanup
> svn: Write-lock stolen in 'core/modules/udb/kernel/bindings'

Wow!  Never seen anyone trigger that before.  I think that means that
you had some other process modifying the working copy at the same time
as you ran cleanup.  Nasty things are likely to happen when you allow
that to occur.

> C:\software\unity\trunk>svn cleanup
> svn: Can't open directory 'core/modules/udb/kernel/bindings/.svn/tmp': The
> system cannot find the path specified.
>
> Am I doing something stupid?  How should I be recovering from this?

What does 'svn status' show?  Are there any log files (check for files
.svn/log in directories that are status 'L') and if so what do they
contain?

-- 
Philip Martin

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org