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

Re: Working directory restore from repository

From: Ulrich Eckhardt <ulrich.eckhardt_at_dominolaser.com>
Date: Thu, 2 Dec 2010 16:52:47 +0100

On Thursday 02 December 2010, Nacho108 wrote:
> I'm kind of new to Tortoise/SVN. I made a solution in VS2010 and its
> repository. Along the solution I was making commits.

Generally there, I'd not version obj, dll, exe, lib, pdb, sln and the
directories created during builds. If in doubt, check if the file is
regenerated and don't commit it then. This is drifting a bit off-topic
though.

> The thing is now that some files were deleted as long with their
> directories.I want to come back to a previous version but when I make
> SVN Update, it gives me an error: tree conflict "one or more files are
> in a conflicted state".

A "tree conflict" means that SVN tried to change something to the filesystem
tree but couldn't. Examples are that it tries to create a file but a file
with the same name is already present. How to resolve that depends. If you
checked in a temporary file that is left after compiling and lateron decided
deleting it, reverting to the previous state will cause a conflict, because
locally the file is regenerated and now SVN wants to restore the file, too.

The solution there is simple, just remove the offending files. You can do so
one-by-one or, if you open the context menu while the shift-key is pressed,
TSVN presents you with the option to delete unversioned files (you can still
deselect some of them, if you want).

Cheers!

Uli

-- 
ML: http://tortoisesvn.tigris.org/list_etiquette.html
FAQ: http://tortoisesvn.net/faq
**************************************************************************************
Domino Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Visit our website at <http://www.dominolaser.com/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Domino Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2687319
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-12-02 16:52:36 CET

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