Re: [BUG] wrong line numbers in TMerge

Gerasimov, Ivan wrote:
> Hello!
> 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.

Should be fixed in revision 7711.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org