#723 Warn if user merges when whitespaces ignored

closed-rejected
nobody
Usability (141)
1
2004-10-04
2004-06-02
Kimmo Varis
No

This is to help user prevent accidentally merge errors
and messing file layouts.

Its easy to turn whitespace ignore on for revieving
changes and forgot to turn it of before merging. Result
is often messed up file layout when indentation changes
are not merged.

This patch checks whitespace ignore setting before user
merges and shows informative warning message. Message
contains "Do not ask again" checkbox so this is only
one-time warning if user so wants.

Discussion

  • Kimmo Varis
    Kimmo Varis
    2004-06-02

    Original and altered files

     
    Attachments
  • Kimmo Varis
    Kimmo Varis
    2004-06-18

    Logged In: YES
    user_id=631874

    I cannot find a good compromise about when this warning
    should be shown.

    It really must not be shown for every merge if user does not
    want to suppress it. It might be nice to show this once
    after WinMerge is started. But then if WinMerge is used as
    external merge app new instance is started for every file...

     
  • Kimmo Varis
    Kimmo Varis
    2004-06-18

    • priority: 5 --> 1
     
  • Kimmo Varis
    Kimmo Varis
    2004-10-04

    • status: open --> closed-rejected
     
  • Kimmo Varis
    Kimmo Varis
    2004-10-04

    Logged In: YES
    user_id=631874

    Closing as rejected.

    We'll need better compare options in 2.3, annoying user with
    warnings is bad.