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

RE: Status "missing, tree conflict"

From: Rowan Sylvester-Bradley <rowan_at_sylvester-bradley.org>
Date: Tue, 30 Aug 2011 11:23:54 -0700 (PDT)

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-08-30 20:23:58 CEST

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