Re: [TSVN] Compares with base not with working copy

Matthias Oneisz wrote:
> 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.

Thanks for the detailed description!
Fixed in revision 2726.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org