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

Re: TortoiseMerge /Create-Apply patch issues

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 20 May 2011 17:06:06 +0200

On 20.05.2011 16:54, Oto BREZINA wrote:
> On 2011-05-20 15:59, zaf646 wrote:
>> I see your point. I guess I can live with that. :)
>>
>> TortoiseMerge still has various issues. For example when I paste two
>> lines between existent lines the result is not the expected one.
>>
>> I want to paste these 2 lines:
>> NEW TEXT1
>> NEW TEXT2
>>
>> Original:
>>
>> Random text1
>> Random text2
>>
>> becomes:
>>
>> Random text
>> NEW TEXT1
>> NEW TEXT2Random text 2
> Seems be more related bugs in that code. Will fix it this evening.

Just tried this: seems to work ok for me.
It depends on how you selected the two lines to insert: if the second
line wasn't selected/copied *without* the EOL, then you get what you
describe. But if it was selected with the EOL, then I get

Random text
NEW TEXT1
NEW TEXT2
Random text 2

As I would expect.

>> Also, when there is a tab, the cursor doesn't move along like it was a
>> tab but more like it's multiple spaces.
>> Try this:
>>
>> BUILD:<TAB>CHECK $(MY_APP)
>>
>> try to select the line from the beginning and watch the cursor.
> Will take care about this this weekend.

Ok, just a hint to make it easier for you to find the problem and fix it:

This is a problem with the coordinates:
the selection is now handled with view coordinates, but the drawing
still happens with screen coordinates.

At least that's what I think from a quick glance over the code...

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2742342
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-20 17:06:13 CEST

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