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

Re: diff handles addition on line end funny sometimes

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 18 May 2009 17:32:19 +0200

David Balažic wrote:
> Hi!
>
> 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.
>
> Example:
> 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.

It depends on how similar the two lines are. If there are too many
changes, TMerge shows the lines as added/removed. Only if there are few
changes it shows the line as blue and those few changes inline.

Stefan

-- 
       ___
  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=2300907
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-05-18 17:33:16 CEST

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