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

Re: TortoiseMerge Tool request

From: golan davidovits <golandav_at_yahoo.com>
Date: Sat, 17 Jan 2009 14:51:20 -0800 (PST)

Thanks Simon for the explanation.
I was thinking about what needed to make the internal Tortoise feature usable in "real world"
and it seems very close to it...

I do want to see the line differences, but also the words/chars specific diff.
BTW, I don't see words diff currently. Is it configuration thing?

Thanks,
Golan

----- Original Message ----
From: Simon Large <simon.tortoisesvn_at_googlemail.com>
To: users_at_tortoisesvn.tigris.org
Sent: Sunday, January 18, 2009 12:40:37 AM
Subject: Re: TortoiseMerge Tool request

2009/1/17 golan davidovits <golandav_at_yahoo.com>:
> Hi,
>
> I have a feature request for TortoiseMerge tool which will make it good candidate to external tools such Kdiff3 and Araxis.
> The comparison between Mine & Theirs should be by words/chars and not by lines. It is very uncomfortable to orientate the differences like that.

Subversion does text file merges based on line diffs. TortoiseMerge
also highlights word differences, but it needs to show what subversion
is doing too. It was never intended as a competitor to KDiff3 or
Araxis. If you want to use a 3rd party tool, go right ahead, there is
support for it.

> BTW, i was happy to see that another important feature - Enable Manual insertions - was added to 1.5.x

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\    http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1031340
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1031346
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-01-17 23:51:32 CET

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