Menu

#2004 No refreshing after merging difference

Trunk
closed-fixed
GUI (515)
7
2010-06-12
2010-05-03
Kimmo Varis
No

Experimental release 2.13.12.

To reproduce:
1. Turn automatic rescanning off
2. Open two files with couple of differences
3. Select one difference
4. Merge the difference (copy to left or right)

Expected:
Difference is merged, no colored lines appear where the difference was

Actual:
Colored lines remain in other file. You need to rescan the files to get rid of them.

This is regression in very basic feature.

Discussion

  • Matthias

    Matthias - 2010-05-06

    this is a wanted feature, so it is noted in the code.

     
  • Kimmo Varis

    Kimmo Varis - 2010-05-07

    Wanted by who? This was slipped past me and it is very bad regression in something that has been working for over 10 years.

    This is very major usability regression. I do not want to see any remainders of already merged difference in my screen.

     
  • Kimmo Varis

    Kimmo Varis - 2010-05-07

    The usability requirement is very clear: when user merges the difference the difference gets merged fully, not so that other side still shows it. That is very confusing. WinMerge was designed so that refreshing clears the difference from the screen. If you want to change that so that refresh is not needed then you need to update diff lines in both sides in editor.

    But current behavior is simply unacceptable.

     
  • Kimmo Varis

    Kimmo Varis - 2010-06-12

    Matthias pointed to me in patch item #3010357 MergeDoc - that SVN revisions:
    r7086 Automatic rescanning was not disabled everywhere.
    r7089 Add forced rescan after loading documents (spotted by Matthias).
    are guilty for this regression.

    Hence I've reverted those revisions:
    Completed: At revision: 7181

     
  • Kimmo Varis

    Kimmo Varis - 2010-06-12
    • assigned_to: nobody --> kimmov
    • status: open --> closed-fixed
     
  • Matthias

    Matthias - 2010-06-13

    the patches are correct! why revert same.
    we have to go on here. I know that will be a long way to go.

     
  • Kimmo Varis

    Kimmo Varis - 2010-06-13

    They cause very bad regression so they are not correct.

     

Log in to post a comment.