Re: Spurious conflicted overlay

Simon Large wrote:
> 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.

Can't reproduce this.
* show log for 'doc'
* select r15754, right-click, "merge revision to...", select
1.6.x\doc\source as the target
* tree conflict on 1.6.x\doc\source
* revert

the overlay changes back to 'normal' as it should.
And it stays as 'normal' even after waiting 10 minutes and two
'cleanup's on 1.6.x.

I used r15754, assuming that's the merge you attempted?
Maybe you merged a different way or another revision?

Stefan

-- 
       ___
  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=1356709
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].