https://bugs.kde.org/show_bug.cgi?id=437910
Bug ID: 437910
Summary: Manual diff alignment does not work anymore
(regression in comparison to 1.8.4)
Product: kdiff3
Version: 1.9.2
Platform: Other
OS: Linux
Status: REPORTED
Severity: normal
Priority: NOR
Component: application
Assignee: reeves...@gmail.com
Reporter: tilman.vo...@web.de
Target Milestone: ---
Created attachment 138901
--> https://bugs.kde.org/attachment.cgi?id=138901&action=edit
example data
SUMMARY
Manual diff alignment is (was) a wonderful tool to help kdiff3 figure out
alignment and often find the right conflict resolution after aligning manually.
Unfortunately between 1.8.4 and 1.9.2 something has changed to make the
alignment markers non-effective.
STEPS TO REPRODUCE
1. Save attached {A,B,C}.txt
2. Run `kdiff3 -m A.txt B.txt C.txt`
3. Place alignment markers on the respective `(align here)` lines
OBSERVED RESULT
In 1.8.4, the alignment lines are in fact visually aligned. A correct conflict
is reported and waits for resolution.
In 1.9.2, the alignment lines are in fact _not_ visually aligned. An incorrect
automatic conflict resolution is produced that arbitrarily orders the
conflicting changes!
Please see screenshots.
EXPECTED RESULT
The correct behaviour observed in 1.8.4.
SOFTWARE/OS VERSIONS
Linux/KDE Plasma: openSUSE Tumbleweed snapshot 20210524
(available in About System)
KDE Frameworks 5.82.0
Qt 5.15.2 (built against 5.15.2)
The xcb windowing system
ADDITIONAL INFORMATION
The 1.8.4 behaviour was recorded with openSUSE Tumbleweed snapshot 20210106.
--
You are receiving this mail because:
You are watching all bug changes.
