[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: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Tue, 28 Apr 2009 15:03:14 +0100

2009/4/28 <webpost_at_tigris.org>:
> I would love a tool that compares wordwise and ignores single line breaks but not double ones.
>
> LaTeX normally does not make a difference between a single line break and a white space, but the text editors keep breaking and appending lines over and over.

Sounds like you need to get a better text editor.

> Is there ever such a tool?

Could be, if you write it.

> More precisely,
>
> It would perfect that the tool compares Mine and Yours, having Old as the reference, treating triple or quadruple line breaks as double line breaks, single line breaks as spaces and then show to me just the real conflicts (words, sentences or paragraphs where both Mine and Yours differ from Old).
>
> In the merged version, it should allow the user to decide if it would borrow the formatation (spaces and line breaks) from Mine, Yours, or Old.

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=1963889
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-28 16:03:31 CEST

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