Hi there,
first: you didn't get you repository in a weird state, just your working
copy. This is why "svnadmin recover" did not help. This also means that the
data in the repository should be fine.
How to get your working copy out of this state is a different question. The
usual advice is "check out a new one with the proper version and copy all
changed files from your old one over to it". This is probably what you
should do.
Next time you decide that you want a file/directory not to be added, don't
abort the command but let it finish and then do an "svn revert <file>" which
will undo you uncommited changes. Once you've commited the changes you'd
have to do a reverse merge (the best thing at this point would be to read
the FAQ and "The Book" which explains this in great detail).
Good luck
felix
Am 04.10.2006 0:59 Uhr schrieb "Brian Hechinger" unter <wonko@4amlunch.net>:
> Here's what I've got. I started to do an 'svn add links_and_passwords'
> and decided to ^C out of it. Well, somehow it started to get it added,
> but never wrote the .svn dirs, so it's *really* confused about this dir.
> I'm not real sure how to fix it.
>
> svn: Working copy '/usr/home/wonko/projects' locked
> svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)
> wonko@zaphod$ svn cleanup .
> svn: 'links_and_passwords' is not a working copy directory
> wonko@zaphod$ svn add links_and_passwords/
> svn: Working copy '.' locked
> svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)
> wonko@zaphod$ svn cleanup .
> svn: 'links_and_passwords' is not a working copy directory
> wonko@zaphod$ svn status
> ? asterisk
> ? bills
> L .
> ? wedding/wedding
> ~ links_and_passwords
> ? ddns/ddns
> ? epcs/libmiscutil/libmiscutil.a
> ? epcs/epcs/testing
> ? epcs/epcs/epcs
> ? epcs/perftest/perftest
> ? epcs/perftest/perftest_merge.c
> ? sigmonster/.sigmonster.c.swp
> ? sigmonster/errors.h
> ? sigmonster/core
> ? sigmonster/sigmonster
> ? misc/random_test
> ? misc/random_test.c
> ? misc/lib_smtp.make
> ? misc/testsend
> ? misc/libsmtp_test
> ? misc/libsmtp_test.c
> ? misc/range.times
> ? ww/ww
>
> This is 1.4.0. I ran an 'svnadmin recover' and that didn't help.
>
> In a directory like epcs, i can check in, update, etc, and things work
> fine, so this isn't effecting the rest of my repository, just that one
> directory that's kinda screwed up. ;)
>
> Thanks!
>
> -brian
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Oct 4 03:54:23 2006