SteveKing wrote:
> Simon Large wrote:
>> Hi Stefan,
>>
>> If I show log for trunk/src/SVN/SVN.cpp with cursor on rev 1856, I
>> can click on SVN.cpp in the bottom pane and select "show
>> differences". The result in TMerge is confused.
>>
>> There should be 11 lines deleted in the left pane and 5 added in the
>> right pane, which is what the unified diff indicates.
>>
>> The left pane shows 5 lines deleted and 6 added.
>
> Sure! If you use "show unified diff" then it shows the differences of
> (rev, rev-1), but if you use "compare with working copy" then the diff
> is shown with (rev, wc).
No, no, no! I said "show differences" on the bottom pane, not "compare
with WC" on the top pane. According to the TMerge pane titles, I am
indeed comparing 1856 with 1855, and the output is wrong. Try it ...
If I did compare with WC, there would be no differences anyway because
my WC is up-to-date.
Simon
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Oct 25 23:20:01 2004