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

diff handles addition on line end funny sometimes

From: David Balažic <david.balazic_at_hermes-softlab.com>
Date: Mon, 18 May 2009 17:28:19 +0200


I noticed this in both v1.5.9 and v1.6.2. (on WinXP Pro SP3)

If I a change a file in the WC, by adding text to the line end,
then sometimes the diff display (TortoiseMerge window)
shows the entire line as "added" and the old line as "removed" (yellow and
"pale" yellow colors).

Sometimes it shows it correctly ("correctly" in my opinion):
the line on both left and right is colored pale blue and the
added text is colored in yet another nuance of yellow ("Inline / Added").

Whay is that ? Is it a bug ?
The first display is harder to read, because it is not obvious,
what part of the line is actually changed and what not.

In the same *.h file I have two changes (copy paste from the
Create Patch... result window):

- virtual int Stop();
+ virtual int Stop();///< fgrg g r g

- // CString m_Description;
+ // CString m_Description; blue

The first change is marked in TortoiseMerge as removed line/added line,
while the second change is modified line/inline added text.


http://www.nosoftwarepatents.com Innovation, not litigation !

David Balažic                 mailto:david.balazic_at_hermes-softlab.com
HERMES Softlab                http://www.hermes-softlab.com
Zagrebska cesta 104           Phone: +386 2 450 8937 
SI-2000 Maribor
"Be excellent to each other." -
Bill S. Preston, Esq. & "Ted" Theodore Logan
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-05-18 17:31:12 CEST

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

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