Re: possible .svn corruption

"James Goodall" <jgoodall@dmetrix.com> writes:

> C:\Code\trunk\project>svn up
> U file1
> U file2
> svn: Problem running log
> svn: in directory ''
> svn: start_handler: error processing command 'merge' in ''
> svn: Error calling external program
> svn: svn_io_run_diff3: Error running 'C:\Cygwin\bin\diff3.exe': exitcode
> was 2, args were:
> in directory '.', basenames:
> .svn/tmp/file3.tmp
> .svn/tmp/file3.tmp.tmp
> .svn/tmp/file3.tmp.2.tmp
[...]
> C:\Code\trunk\project >svn cleanup
> svn: Problem running log
> svn: in directory ''
> svn: start_handler: error processing command 'modify-entry' in ''
> svn: error getting file affected time on `.svn/props/file3'

Wow! Lots of bugs!

First bug, svn_wc__adm_steal_write_lock doesn't set wc_format in the
access baton, so 'file3' gets used rather than 'file3.svn-work' and
the former doesn't exist.

Second bug, cleanup doesn't run the external merge command. This is
why cleanup doesn't generate the diff3.exe error, and why it gets far
enough to cause the props error!

Third bug, 'svn st' does not show the lock for an incomplete
directory. An incomplete directory is fixed by running 'svn up' but
the lock means that 'svn cleanup' is needed before 'svn up' can be
run, so 'svn st' should show both '!' and 'L'.

Bugs 1 and 2 are old, bug 3 is fairly new. Bugs 1 and 3 are probably
simple to fix, bug 2 may be a bit more work.

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