#1747 Opening mixed-EOL file forces other side to be mixed

Branch_+_Trunk
closed-fixed
None
5
2009-05-14
2008-07-19
Kimmo Varis
No

Current trunk (r5640).

If you open two files, another being mixed-EOL and another having just one EOL type, both files are shown as Mixed-EOL. Which is a bit confusing for the user.

This also causes that WinMerge may copy wrong EOL types when copying differences and actually make a non-mixed EOL file mixed-EOL file.

Instead we should handle non-mixed-EOL file as such and properly convert EOL types when copying differences.

Discussion

  • Kimmo Varis

    Kimmo Varis - 2009-05-12
    • milestone: --> Branch_+_Trunk
    • assigned_to: nobody --> kimmov
     
  • Kimmo Varis

    Kimmo Varis - 2009-05-12

    Attached a patch (per_buffer_mixed_eol.patch).

    This patch moves mixed-eol info to text buffer, so both buffers can have it set independently. And views ask from attached buffer if the eol style is mixed.

    I'm considering this for 2.12 branch too.

     
  • Kimmo Varis

    Kimmo Varis - 2009-05-12

    Fix committed to SVN trunk:
    Completed: At revision: 6732

     
  • Kimmo Varis

    Kimmo Varis - 2009-05-12
    • status: open --> open-fixed
     
  • Kimmo Varis

    Kimmo Varis - 2009-05-12

    Matthias found a bug from my patch:
    #2790879 Wrong EOL Style displayed
    http://winmerge.org/bug/2790879

    Looking at it..

     
  • Kimmo Varis

    Kimmo Varis - 2009-05-12

    Attached a patch (fix_for_mixed_eol_statuses.patch) that fixes the bug Matthias found. And fix is also what Matthias suggested.

     
  • Kimmo Varis

    Kimmo Varis - 2009-05-12

    Committed the fix to SVN trunk:
    Completed: At revision: 6735

     
  • Kimmo Varis

    Kimmo Varis - 2009-05-14

    Committed to 2.12 branch:
    Completed: At revision: 6750

     
  • Kimmo Varis

    Kimmo Varis - 2009-05-14
    • status: open-fixed --> closed-fixed
     

Log in to post a comment.

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks