[sorry to reply out of the thread, I just subscribed to the list and I
don't have the original message to reply to]
Date: Tue, 22 Feb 2005 18:16:29 +0100
From: SteveKing <steveking@gmx.ch>
>> It occurs if a textfile was changed on the server and the same file was changed
>> in the local working copy.
>>
>> When i'm klick right mouse button on the changed local file an select TOROISE
>> SVN / CHECK FOR MODIFICATIONS the Changed Files Dialog appears. Now i do a
>> rightclick on the CHECK REPOSITORY button. Then the file appears in the
>> listview as "Text Status = modified" and "Remote Text Status = modified". Now i
>> do a rightclick on the file (in the listview) an select COMPARE WITH WORKING
>> COPY. Now Tortoise Merge appears and shows three Areas. But in the Area YOURS -
>> test.txt : WORKING COPY the content is NOT from the working copy, its the
>> content from the base.
>
>Thanks for the detailed description!
>Fixed in revision 2726.
I noticed the same problem and downloaded a nightly build (2734) to
get around this.
But now, when I "compare with working copy", I get a two-paned instead
of a three-paned TortoiseMerge. The left pane says "Working Base (not
found)", the right one "Working Copy".
When I hover over the left pane's title, the tooltip says:
"path\.svn\text-base\file.svn-base \theirs:"
The right one says:
"path\file"
Regards,
NeoN
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Mar 5 01:42:49 2005