Status "missing, tree conflict"

[Rowan Sylvester-Bradley]

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-un...@tortoisesvn.tigris.org].

[Markus Schaber]

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.sc...@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:ro...@sylvester-bradley.org]
> Gesendet: Sonntag, 28. August 2011 17:02
> An: us...@tortoisesvn.tigris.org
> Betreff: Status "missing, tree conflict"

> unsub...@tortoisesvn.tigris.org].

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

[Rowan Sylvester-Bradley]

Thanks Marcus,

What I see in the Check for Modifications window is:
Path
public_html/members/music/mp3/Frank_Mass_AgnusDei.mp3 missing, tree conflict
public_html/members/music/mp3/Tippet_DivertimentoSellingersRound_1_Allegro.mp3 missing, tree conflict
public_html/members/music/mp3/Tippet_DivertimentoSellingersRound_2_AndanteEspressivo.mp3 missing, tree conflict
public_html/members/music/mp3/Tippet_DivertimentoSellingersRound_3_Presto.mp3 missing, tree conflict
public_html/members/music/mp3/Tippet_DivertimentoSellingersRound_4_Adagio.mp3 missing, tree conflict
public_html/members/music/mp3/Tippet_DivertimentoSellingersRound_5_AllegroAssai.mp3 missing, tree conflict
public_html/members/music/mp3/Tippett_DivertimentoSellingersRound_1_Allegro.mp3 added(+), tree conflict
public_html/members/music/mp3/Tippett_DivertimentoSellingersRound_2_AndanteEspressivo.mp3 added(+), tree conflict
public_html/members/music/mp3/Tippett_DivertimentoSellingersRound_3_Presto.mp3 added(+), tree conflict
public_html/members/music/mp3/Tippett_DivertimentoSellingersRound_4_Adagio.mp3 added(+), tree conflict
public_html/members/music/mp3/Tippett_DivertimentoSellingersRound_5_AllegroAssai.mp3 added(+), tree conflict

The options in the context menu for the missing files are:
Compare with Base
Commit...
Revert...
Show Log
Blame
Delete
Edit Conflicts
Resolved

For the added files it's:
Compare with Base
Show differences as unified diff
Commit...
Revert...
Show Log
Blame
Open
Open With
Explore To
Edit Conflicts
Resolved
Create Patch

Which of these do I need to do?

All the files in the working directory are correct, so I don't want to change any of them - I just want SVN to resolve the conflicts and stop complaining. I would have thought that I could just choose delete for the missing files, but this doesn't work. First of all it says this file is not under version control, do you really want to delete it, and if I then say Yes it tells me it can't find the file so it can't delete it. How do I delete these pesky non-existent but conflicting files?

Preferably I would like to retain any change history that I had before renaming the file. How do I do this?

If I do Show Log on one of the missing files, it says "file is not under version control". If I do Show Log on one of the added files, it bizarely says (for example): File not found: revision 42, path '/grantachorale.org.uk/public_html/members/music/mp3/Tippet_DivertimentoSellingersRound_1_Allegro.mp3'

This suggests that somewhere it still thinks the file is called the old name (Tippet, not Tippett). How do I correct this?

On searching, I found the old names in the 'entries' file. I tried correcting them here, but that didn't work either (Check for Modifications then shows "Invalid conflict info in tree conflict description") so I changed the 'entries' file back again.

Thanks for your help - Rowan

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

[Dominik Psenner]

> This suggests that somewhere it still thinks the file is called the old name (Tippet, not Tippett). How do I correct this?

By renaming the file back ("Tippet" => "Tippett") and then do:

$ svn move Tippett Tippet

SVN then correctly knows that you renamed the file and a subsequent:

$ svn commit

should work without bailing.
--
Dominik Psenner
## OpenPGP Key Signature #################################
# Key ID: B469318C #
# Fingerprint: 558641995F7EC2D251354C3A49C7E3D1B469318C #
##########################################################

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

[Rowan Sylvester-Bradley]

Thanks for your reply.

>renaming the file back ("Tippet" => "Tippett")

Do you mean rename using Windows Explorer (so SVN doesn't know about it), or by using the TortoiseSVN command (so it does)?

>$ svn move Tippett Tippet

What's the TortoiseSVN equivalent of this?

Thanks - Rowan

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

[Bob Archer]

> Thanks for your reply.
>
> >renaming the file back ("Tippet" => "Tippett")
>
> Do you mean rename using Windows Explorer (so SVN doesn't know about
> it), or by using the TortoiseSVN command (so it does)?
>
> >$ svn move Tippett Tippet
>
> What's the TortoiseSVN equivalent of this?
>

TSVN -> Rename...

BOb

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