David Casti <david@neosynapse.net> writes:
> -- Thinking that I may be able to get around this problem by checking
> out a new copy and working on that, I try --
>
>
> [root_at_mail tmp]# svn co file:///home/subversion/trunks/defender
> subversion/libsvn_wc/adm_files.c:1058: (apr_err=155000, src_err=0)
> svn: Obstructed update
> svn: revision 8 doesn't match existing revision 7 in 'defender'
When you check-out over an existing working copy the revision and URL
must match, so 'svn co -r7'. However it won't work if part of the
target working copy is switched, since the URL won't match, and it
won't work in a mixed revision working copy, since at some point the
revision won't match. You may be able to checkout individual
subdirectories of your working copy. I don't think doing any of this
is going to help in your case.
> -- OK, maybe my repository database is hosed. Let's recover --
No, your database is OK.
> [root@mail tmp]# /usr/local/BerkeleyDB.4.0/bin/db_recover -v -h
>
> /home/subversion/db
> db_recover: Finding last valid log LSN: file: 29 offset 990376
> db_recover: Checkpoint at: [29][990328]
> db_recover: Checkpoint LSN: [29][990328]
> db_recover: Previous checkpoint: [29][989136]
> db_recover: Checkpoint at: [29][989136]
> db_recover: Checkpoint LSN: [29][989136]
> db_recover: Previous checkpoint: [29][987944]
> db_recover: Recovery complete at Sun Nov 10 14:33:52 2002
> db_recover: Maximum transaction id 80000000 Recovery checkpoint [29][990328]
>
> -- no change. I am completely stuck: can't check out, can't update,
> can't get status, can't commit... So, two questions:
Does status without -u work? You may also find that some commands
work if you specify files or subdirectories within the working copy,
rather than trying to operate on the whole working copy.
> 1. How do I recover from this state?
Run diff and save the output to create a patch. Delete the working
copy. Checkout a new working copy. Apply the patch. Before you do
that, please tell us what you switched. The 'svn info' command will
tell you what URL is associated with particular files/directories.
The status command, if it works, should show 'S' for switched
files/directories.
> 2. Any ideas how I got into it, so I can avoid a repeat?
No. Please tell us what you switched. Switch still has problems, see
issue 891 for example.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 11 02:43:35 2002