[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: got my repository into a weird state

From: Brian Hechinger <wonko_at_4amlunch.net>
Date: 2006-10-04 18:38:50 CEST

On Wed, Oct 04, 2006 at 03:53:41AM +0200, Felix Gilcher wrote:
> Hi there,

Hello!

> 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.

Ah ha!

> 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.

Easy to deal with in this case since nothing changed to the repository other
than adding that dir, so very easy to revert. I'm not back to a sane state!

> 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).

I will keep this in mind going forward. No more ^c for me. ;)

-brian

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Oct 4 18:40:26 2006

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.