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

[TSVN] TMerge: Line numbers wrong

From: Norbert Unterberg <nunterberg_at_gmail.com>
Date: 2005-05-31 13:48:37 CEST

Depending on the files you compare and the TMerge settings, TMerge
gets totally confused with the line number display when diffing files.

See attached screen shot as an example.

TortoiseSVN 1.2.0, Build 3551

Steps do duplicate:
* Open TMerge, goto the settings and and make sure that "Ignore line
endings" is turned off.
* Close TMerge
* Create a text file in your WC, set its "svn:eol-style" property to
native, and commit.
* Modify this file: delete some lines and add some new lines
* Right click on that modified file in your working copy and select TSVN Diff.

TMerge starts and shows the hole file as difference. Why is that?
Ok, next steps:

* In TMerge, goto the settings dialog and enable the "Ignore line
endings" switch.

After clicking OK, TMerge shows the line numbers in the strange way as
you can see in the screen shot.

When you close TMerge and select Diff on the same file again, then the
line numbers look much better. However, it still misses line numbers
on deleted lines on the left file. See the second screen shot.

Norbert

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

tmerge-lines.PNG tmerge-2.PNG
Received on Tue May 31 13:49:21 2005

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.