2009/3/19 Simon Large <simon.tortoisesvn_at_googlemail.com>:
> 2009/3/19 Stefan Küng <tortoisesvn_at_gmail.com>:
>> 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?
>
> Not sure exactly how to reproduce it, but this is a cut down version
> of the working copy with most of the content excluded. It still shows
> clean in CfM and has a conflicted overlay.
>
> Simon
>
I see that it is wc of trunk,
so you attempted to merge branch into trunk, not vice versa?
For the record:
svn st --no-ignore
svn st -u
both do show the conflicts there.
Filed an issue:
http://subversion.tigris.org/issues/show_bug.cgi?id=3382
I wondered, that your WC has /.svn/format with value of 10.
Fresh checkouts with 1.6 and svn updates of 1.5 (format 9) wc
do not have that file at all. I know it was removed during
development of 1.6
Probably its presence does not hurt anything. Just mentioning, if you
would look for a reason to do a fresh checkout.
Best regards,
Konstantin Kolinko
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=1358981
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-03-20 00:29:08 CET