Bug 29781 - meld: 3-way merge window too big
Summary: meld: 3-way merge window too big
Status: RESOLVED FIXED
Alias: None
Product: Mageia
Classification: Unclassified
Component: RPM Packages (show other bugs)
Version: 8
Hardware: All Linux
Priority: Normal normal
Target Milestone: ---
Assignee: QA Team
QA Contact:
URL:
Whiteboard: MGA8-64-OK
Keywords: advisory, validated_update
Depends on:
Blocks:
 
Reported: 2021-12-18 14:32 CET by Marc Krämer
Modified: 2022-01-16 21:40 CET (History)
4 users (show)

See Also:
Source RPM: meld-3.21.0-2.mga8.src.rpm
CVE:
Status comment:


Attachments
left part of meld window (336.74 KB, image/png)
2021-12-18 21:32 CET, sturmvogel
Details
right part of meld window (337.32 KB, image/png)
2021-12-18 21:33 CET, sturmvogel
Details

Description Marc Krämer 2021-12-18 14:32:17 CET
if you use meld for a 3way merge (e.g. for git/mercurial) and the (laptop) display is "small" (1366x768) the opening meld window is wider than the screen. This worked at least in mga7. It really gets annoying to move the window arround to see what gets merged.
Comment 1 Lewis Smith 2021-12-18 20:50:15 CET
Thank you for the report.
"1366x768" is hardly small. It happens to be what my desktop screen is. Is there any *easy* way I could try this without getting bogged down in a hundred site registrations?
Does the problem only arise with 3way merge?

Is the window maximised, or at the intermediate size? If you maximise it, does it still overflow the screen width?
Obvious point: can you RESIZE the window to fit the screen? This often only works if you can seize the bottom RH corner, but in your case should work if you can seize either LH or RH window edge. If you cannot 'see' the edge or corner to grab to resize, holding down ALT usually enables the window to be moved (dragged) partly off-screen so you can see the vital edge or corner.

CC: (none) => lewyssmith

Comment 2 sturmvogel 2021-12-18 21:31:57 CET
Can confirm this behaviour on Mag8 Plasma x86_64 with 1600x900 screen resolution. The meld window itself (for a 3-way merge) is not resizable in width. Only in height.
Comment 3 sturmvogel 2021-12-18 21:32:43 CET
Created attachment 13056 [details]
left part of meld window
Comment 4 sturmvogel 2021-12-18 21:33:08 CET
Created attachment 13057 [details]
right part of meld window
Comment 5 sturmvogel 2021-12-18 21:44:41 CET
The actual upstream version 3.20.4 from 13. Aug 2021 https://meldmerge.org/ is also not resizeable in width, BUT it actually scales/fits to the right screen resolution. So there seems to be a problem in our packaged version.
Comment 6 Marc Krämer 2021-12-19 16:32:24 CET
that really would help. Instead I need to move the window around. On my big desktop screen, it works (most of the time). But it has a resolution of 1920x
Comment 7 sturmvogel 2021-12-19 16:58:32 CET
Marc, could you test if the upstream version 3.20.4 works for you with 1366x768 screen resolution? No need for installation, only unpack the archive and run /bin/meld out of the directory.
Comment 8 Marc Krämer 2021-12-19 17:04:16 CET
In mageia8 we have 3.21.0 (which is a devel version). And by downloading and testing I can say: 3.20.4 works, 3.21.0 not!
Comment 9 Marc Krämer 2021-12-19 17:07:08 CET
@David: you changed the version to 3.21.0 (on 2020-04-22), can you please fix it, and/or fill a bug upstream?

Assignee: bugsquad => geiger.david68210

Comment 10 Lewis Smith 2021-12-19 20:19:12 CET
Thank you sturmvogel for your extra information.

This looks an unusual case of us pushing something too in advance. Clearly if 'meld' can be reverted to 3.20.4, that would suffice.

CC: lewyssmith => (none)

Comment 11 Marc Krämer 2021-12-22 12:52:05 CET
We have only 2 possibilities:
- patching
- or increasing epoch (+downgrade)
Comment 12 Marc Krämer 2022-01-01 17:09:20 CET
@David: what do we do about this? it is really anoying!
Comment 13 Marc Krämer 2022-01-14 00:21:16 CET
Downgraded meld package:

An unstable version was pushed submitted to mageia. This "update" reverts the package to the latest stable version.

========================

Updated packages in core/updates_testing:
========================
meld-3.20.4-1.mga8.noarch

SRPM:
meld-3.20.4-1.mga8.src.rpm

Assignee: geiger.david68210 => qa-bugs

Comment 14 Herman Viaene 2022-01-15 16:34:43 CET
MGA8-64 Plasma on Lenovo B50 in Dutch
No installation isues.
I staged a 3-way file comparison and the three windows fitted nicely into the starting window which was about half the size of my screen.
Looks good.

CC: (none) => herman.viaene
Whiteboard: (none) => MGA8-64-OK

Comment 15 Thomas Andrews 2022-01-15 22:54:31 CET
Validating. Advisory in Comment 13.

CC: (none) => andrewsfarm, sysadmin-bugs
Keywords: (none) => validated_update

Dave Hodgins 2022-01-16 20:35:22 CET

Keywords: (none) => advisory
CC: (none) => davidwhodgins

Comment 16 Mageia Robot 2022-01-16 21:40:14 CET
An update for this issue has been pushed to the Mageia Updates repository.

https://advisories.mageia.org/MGAA-2022-0009.html

Status: NEW => RESOLVED
Resolution: (none) => FIXED


Note You need to log in before you can comment on or make changes to this bug.