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

Re: Confused by Tortoise Merge Dialog for Simple Example

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 28 Oct 2014 19:38:52 +0100

On 28.10.2014 10:03, Alexandre Guillemé wrote:
> Maybe you didn'y have end of line after "Change 1"
> so when you added "Change 2", you also added a "CR/LF" after Change 1,
> so the line is different

Or: no EOL at the end of the last line.
TortoiseSVN is using the diffing engine of the svn library. And that lib
does the diff using blocks of lines. So if the last line does not have
an EOL, it is not considered a complete line and therefore treated as
part of the previous block.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest interface to (Sub)version control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-10-28 19:38:24 CET

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.