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

[BUG] wrong line numbers in TMerge

From: Gerasimov, Ivan <Ivan.Gerasimov_at_transas.com>
Date: 2006-10-04 16:34:47 CEST

TMerge shows wrong line numbers when editing conflicts.
The simplest case is:

# create three files c:\tmp\a, c:\tmp\b and c:\tmp\c.
echo a > c:\tmp\a
echo b > c:\tmp\b
copy nil c:\tmp\c

# now run TMerge:
TortoiseMerge.exe /theirs:c:\tmp\a /mine:c:\tmp\b /base:c:\tmp\c

Theirs file - 'c:\tmp\a' will have the only line numbered as 2.

I've seen more complicated case, such as same numbers in different lines, though believe that cause is the same.

I'm using TortoiseSVN 1.4.0, Build 7501 - 32 Bit , 2006/09/15 21:34:55
Bug is reproducible with the version built from trunk.

Sincerely yours,
Ivan Gerasimov

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Oct 4 16:34:59 2006

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