Menu

#1663 Diff engine highlightes bad parts of line

Branch_+_Trunk
closed-fixed
5
2008-12-27
2008-01-31
No

VERSION: 2.6.4.0 Unicode

When comparing these two files (file1.cs and file2.cs)

Discussion

  • Marek Pokorny

    Marek Pokorny - 2008-01-31
     
  • Marek Pokorny

    Marek Pokorny - 2008-01-31
     
  • Marek Pokorny

    Marek Pokorny - 2008-01-31

    Logged In: YES
    user_id=1996845
    Originator: YES

    File Added: File2.cs

     
  • Marek Pokorny

    Marek Pokorny - 2008-01-31
    • summary: Changes visualisation not working --> Diff engine higlightes bad parts of file
     
  • Marek Pokorny

    Marek Pokorny - 2008-01-31
     
  • Marek Pokorny

    Marek Pokorny - 2008-01-31

    Logged In: YES
    user_id=1996845
    Originator: YES

    When comparing these two files (file1.cs and file2.cs) the result seen in Diff Pane was:
    (characters ## - the highlighted part)

    get{return #(#m_bIsLoaded);}
    get{return (m_bIsLoaded);}#// end get#

    This is wrong.

    File Added: winmerge.ini

     
  • Marek Pokorny

    Marek Pokorny - 2008-01-31
    • summary: Diff engine higlightes bad parts of file --> Diff engine highlightes bad parts of line
     
  • Tomer Shalev

    Tomer Shalev - 2008-02-10

    Logged In: YES
    user_id=298505
    Originator: NO

    I got some similar behavior. See my attachment (winmerge_diff_highlighting.jpg)

    HKR,"Interrupt #Management\MessageSignaledInterruptProperties",MSISupported,0x00010001,0#
    HKR,"Interrupt #Management\MessageSignaledInterruptProperties",MSISupported,0x00010001,1#

    Instead of:
    HKR,"Interrupt Management\MessageSignaledInterruptProperties",MSISupported,0x00010001,#0#
    HKR,"Interrupt Management\MessageSignaledInterruptProperties",MSISupported,0x00010001,#1#

     
  • Marcel Gosselin

    Marcel Gosselin - 2008-05-10

    Logged In: YES
    user_id=1236935
    Originator: NO

    These issues are different.

    tomers: It is a option you can set. See the issue you created in the tracker, I answered there.

    xpokor13: The only way I was able to reproduce this problem is with the following steps.

    - "Automatic rescan" option must be OFF.
    - Put the "Line differencing coloring" option to "Word-level: Break at whitespace"
    - Open the two files to compare
    - Change the "Line differencing coloring" option to "Character level"

    Was that your case?

     
  • Marek Pokorny

    Marek Pokorny - 2008-05-12

    Logged In: YES
    user_id=1996845
    Originator: YES

    marcelgosselin: I tried this with version 2.6.14.0

    I put the "Line differencing coloring" option to "Word-level: Character level"
    and result was like this:

    (characters ## - the highlighted part)

    I atteched my winmerge_2.6.14.1.ini

    get{return #(#m_bIsLoaded);}
    get{return (m_bIsLoaded);}#// end get#

     
  • Marek Pokorny

    Marek Pokorny - 2008-05-12

    Logged In: YES
    user_id=1996845
    Originator: YES

    marcelgosselin: Sorry :
    I put the "Line differencing coloring" option to "Character-level"

     
  • Marek Pokorny

    Marek Pokorny - 2008-05-12

    New ini file

     
  • Marek Pokorny

    Marek Pokorny - 2008-05-12

    Logged In: YES
    user_id=1996845
    Originator: YES

    File Added: winmerge_2.6.14.1.ini

     
  • Kimmo Varis

    Kimmo Varis - 2008-12-27

    Oops. Forgot to close this bug report. It was fixed for 2.8 branch and for 2.10 stable releases.

    Closing now, thanks for Matthias for notifying me.

     
  • Kimmo Varis

    Kimmo Varis - 2008-12-27
    • milestone: --> Branch_+_Trunk
    • assigned_to: nobody --> marcelgosselin
    • status: open --> closed-fixed
     

Log in to post a comment.