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

AW: Status "missing, tree conflict"

From: Markus Schaber <m.schaber_at_3s-software.com>
Date: Mon, 29 Aug 2011 08:24:47 +0200

Hi, Rowan,

If you right-klick on the directory containing the conflicting file, and then chose "Check for modifications" from the TortoiseSVN menu, you should get a window showing that conflicting file (beneath all other local modifications).

With the context-menu in that window, you should have several options to resolve that conflict.

Mit freundlichen Grüßen

Markus Schaber

___________________________
We software Automation.

3S-Smart Software Solutions GmbH
Markus Schaber | Entwicklung
Memminger Str. 151 | 87439 Kempten | Tel. +49-831-54031-0 | Fax +49-831-54031-50

Email: m.schaber@3s-software.com | Web: http://www.3s-software.com
CoDeSys Internet-Forum: http://forum.3s-software.com

Geschäftsführer: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner | Handelsregister: Kempten HRB 6186 | USt-IDNr.: DE 167014915

> -----Ursprüngliche Nachricht-----
> Von: Rowan Sylvester-Bradley [mailto:rowan_at_sylvester-bradley.org]
> Gesendet: Sonntag, 28. August 2011 17:02
> An: users_at_tortoisesvn.tigris.org
> Betreff: Status "missing, tree conflict"
>
> I've got my system into a mess. Whenever I say "check for modifications"
> it tells me that one file has status "missing, tree conflict". This is, I
> think, a file I (stupidly) renamed using Windows Explorer, not using
> Tortoise SVN. The file (with its new name) shows up with a tick on it. The
> file with its old name does not exist in the working directory, but it
> must still exist in the repository somewhere. If I do a Commit, it tells
> me it's completed successfully, but the icons on the folders in Windows
> Explorer show a "caution" sign (exclamation mark). I've tried Clean Up,
> but it didn't help.
>
> How do I sort this out without losing any history (log) or changes?
>
> I don't really understand what SVN stores where - it would help to have a
> better understanding of this... Then maybe I could fix problems like this
> by manually changing things.
>
> Thanks - Rowan
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId
> =2831606
>
> To unsubscribe from this discussion, e-mail: [users-
> unsubscribe_at_tortoisesvn.tigris.org].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2832016

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-08-29 08:24:56 CEST

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