Philip,
Philip Martin wrote:
> Ben Collins-Sussman <sussman@collab.net> writes:
>
>
>>Jan Evert van Grootheest <j.grootheest@euronext.nl> writes:
>>
>>
>>>D:\svn\MAL\MAL\Dev\development\3rdparty\ACE\ACE_wrappers>svn up
>>>svn: Attempted to lock an already-locked dir
>>>svn: working copy locked: .
>>>svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)
>>>
>>>D:\svn\MAL\MAL\Dev\development\3rdparty\ACE\ACE_wrappers>svn cleanup
>>>svn: Problem running log
>>>svn: in directory 'docs/tutorials/005'
>>>svn: The system cannot find the file specified.
>>>svn: svn_io_copy_file: error copying
>>>'docs/tutorials/005/.svn/tmp/text-base/clie
>>>nt_handler.cpp.svn-base' to 'docs/tutorials/005/client_handler.cpp.tmp'
>>
>>The wc journals are supposed to be idempotent; in other words, when
>>'svn cleanup' re-runs the journal, it should all just work, even if it
>>means re-running some journaled commands.
>>
>>But we've seen an elusive win32 bug related to file i/o. The journal
>>obviously has a command to copy a specific .svn-base file to a .tmp
>>file, but the .svn-base file isn't present. This is probably that
>>mysterious win32 file i/o bug.
>>
>>
>>>How would one normally recover from this?
>>
>>Exactly what you did below.
>
>
> Not quite, I would not recommend editing the entries file. Simply
> delete the tutorials directory and leave the entries file alone. The
> tutorials directory will be identified as missing and a subsequent
> update will restore it.
>
>
>>>I deleted the tutorials directory and removed it from
>>>docs/.svn/entries. After that cleanup completed succesfully and
>>>another update worked.
>
>
> Removing the directory from docs/.svn/entries file will only work if
> the entries file marks docs as incomplete. If docs is not marked
> incomplete then the client will not know about the missing directory
> and will not restore it.
Unfortunately, the docs directory _is_ marked incomplete. I'd guess that
is because it is actually being updated (the tutorials is being updated
because it previously did not exist in the wc).
-- Jan Evert
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 5 09:07:08 2003