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 602871 - blocks representing conflicts in three-way diffs are missing arrows
blocks representing conflicts in three-way diffs are missing arrows
Status: RESOLVED FIXED
Product: meld
Classification: Other
Component: filediff
1.3.x
Other Linux
: Normal normal
: ---
Assigned To: Kai Willadsen
Stephen Kennedy
Depends on:
Blocks:
 
 
Reported: 2009-11-24 21:05 UTC by Sami Wagiaalla
Modified: 2010-03-01 08:23 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
missing arrows (145.37 KB, image/png)
2009-11-24 21:05 UTC, Sami Wagiaalla 		  Details
with arrows (160.85 KB, image/png)
2009-11-24 21:12 UTC, Sami Wagiaalla 		  Details
Proposed patch (3.43 KB, patch)
2010-02-15 01:05 UTC, Kai Willadsen 		none Details | Review

Description Sami Wagiaalla 2009-11-24 21:05:06 UTC 
This worked in 1.2.x
but not in 1.3.0
Comment 1 Sami Wagiaalla 2009-11-24 21:05:45 UTC 
Created attachment 148412 [details]
missing arrows
Comment 2 Sami Wagiaalla 2009-11-24 21:12:57 UTC 
Created attachment 148413 [details]
with arrows

btw syntax highlighting is great! Thanks
Comment 3 Sami Wagiaalla 2009-11-24 21:34:22 UTC 
If I click it the right spot the blocks move properly. So the buttons are there but the arrows are just not being painted. Also, this issue is only with the red blocks the blue blocks for example have the proper arrows.
Comment 4 Kai Willadsen 2010-02-15 01:05:54 UTC 
Created attachment 153807 [details] [review]
Proposed patch

This patch applies to HEAD, and brings back the arrows. It's adds some additional logic so that we don't show replace arrows for empty conflict blocks, but otherwise it's pretty simple.

Testing appreciated.
Comment 5 Kai Willadsen 2010-03-01 08:23:23 UTC 
I've pushed the above patch to HEAD. Thanks for the bug report.