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

[TSVN] Compares with base not with working copy

From: Matthias Oneisz <matthias.oneisz_at_creditplus.de>
Date: 2005-02-22 14:25:08 CET

Hello Tortoise Team,

maybe i have found a bug in Tortoise 1.1.3 .

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.

beyond that, Tortoise is very nice... :-)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Feb 22 14:35:51 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.