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

Spurious conflicted overlay

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Wed, 18 Mar 2009 22:37:43 +0000

Hi folks,

I made a mistake when trying to merge earlier this evening. I merged
trunk/doc into branches/1.6.x/doc/source and got a tree conflict on
source. Oops, revert that!

Now I have a conflicted overlay on source, but CfM shows no conflicts,
and I am allowed to commit from the top level doc folder. Since then I
upgraded to the latest nightly, and also tried cleanup, but nothing
will clear the conflicted overlay. Killing TSVNcache.exe clears it for
a short time, but after a while it goes back to conflicted. svn status
shows no conflicts either.

Any ideas?

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=1351195
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-03-18 23:38:01 CET

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