After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 689790 - 'svn diff' shouldn't suggest to merge the change back into the read-only temp file
'svn diff' shouldn't suggest to merge the change back into the read-only temp...
Status: RESOLVED DUPLICATE of bug 321637
Product: meld
Classification: Other
Component: filediff
1.7.x
Other FreeBSD
: Normal normal
: ---
Assigned To: meld-maint
meld-maint
Depends on:
Blocks:
 
 
Reported: 2012-12-06 18:11 UTC by Yuri
Modified: 2012-12-06 20:39 UTC
See Also:
GNOME target: ---
GNOME version: ---



Description Yuri 2012-12-06 18:11:17 UTC
When 'meld diff' is run on the subversion repository file that has differences, meld offers arrows in both directions: left to right to revert the change back to the repository version, and right to left, suggesting adopting the change into the read-only repository version. When the left arrow is pressed and meld is closing, it asks if the user would like to save or discard the changes.

This latter choice, right to left merge, shouldn't exist for comparisons with the read-only repositories.

Perhaps there should be some other choice with different symbol symbol. Maybe the left arrow with the vertical line next to it showing that the change will be removed from the right side without moving to the left one.

meld-1.7.7
Comment 1 Yuri 2012-12-06 18:19:44 UTC
Also, when Shift is pressed, meld offers arrows to cross suggesting to delete the lines without merging. And again, the cross appears near the left, read-only version too. This is wrong.

Maybe for read-only vs. writable comparison situation, there should be no "Shift" mode. And right-to-left arrow should always be replaced with the cross on the right side?
Comment 2 Kai Willadsen 2012-12-06 20:39:54 UTC
Thanks for the bug report. This particular bug has already been reported into our bug tracking system, but please feel free to report any further bugs you find.

*** This bug has been marked as a duplicate of bug 321637 ***