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

Diffing whitespace changes in TMerge

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2006-06-12 23:49:41 CEST

Hi Stefan,

I have been testing the diffing in r6759. Simple code changes diff very
nicely now, but re-wrapped text still seems to do funny things.

I attached a pair of text files which I have been using for diff tests,
which contains 2 chunks of rewrapped text. The first one is correctly
marked as having whitespace-only changes, but the inline and diffbar
changes do not always make sense.

The second chunk shows only some of the lines as rewrapped.

My installation is a couple of days old, so this may have been fixed.

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org

// pointer to function returning int
void EventWrite(U8 EventType, U8 Device)
void EventWriteShort(U8 EventType, U8 Device)

2. The icons may only be used for a Subversion
   client application, or for an application with
   Subversion support (e.g. an IDE). You may not
   use these icons for to represent actions which
   are not directly related to Subversion.

We, the developers of CyberSnorkels, would like to change the product
distribution license from the GNU GPL to a different open source
license. Although the copyright is in very few names, we wanted to
ask permission of the many people who have contributed to the project,
which is why you are receiving this mail now.

// pointer to function returning pointer to int
void EventWrite(U8 EventType, U8 Ident)
void EventWriteLong(U8 EventType, U8 Device)

2. The icons may only be used for a Subversion client application,
   or for an application with Subversion support (e.g. an IDE).
   You may not use these icons for to represent actions which are
   not directly related to Subversion.

We, the developers of CyberSnorkels, would like to
change the product distribution license from the
GNU GPL to a different open source license.
Although the copyright is in very few names, we
wanted to ask permission of the many people who
have contributed to the project, which is why
you are receiving this mail now.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jun 12 23:50:03 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.