Bug 336794 - kdiff3 ignores context during 3-way merges
Summary: kdiff3 ignores context during 3-way merges
Status: REPORTED
Alias: None
Product: kdiff3
Classification: Applications
Component: application (other bugs)
Version First Reported In: unspecified
Platform: unspecified Linux
: NOR normal
Target Milestone: ---
Assignee: michael
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-06-27 14:29 UTC by plebeaupin
Modified: 2019-01-16 03:03 UTC (History)
1 user (show)

See Also:
Latest Commit:
Version Fixed/Implemented In:
Sentry Crash Report:

Attachments
tape archive containing the referenced files to reproduce the issue (10.00 KB, application/octet-stream)
2014-06-27 14:29 UTC, plebeaupin 		Details
View All Add an attachment

Note You need to log in before you can comment on or make changes to this bug.
Description plebeaupin 2014-06-27 14:29:33 UTC 
Created attachment 87428 [details]
tape archive containing the referenced files to reproduce the issue

During a 3-way merge, kdiff3 ignores context lines, such that lines added in "local" in the middle of lines removed in "other" result in lines being put in the middle of nowhere in the output.

To reproduce, run
kdiff3 [--auto] base left right -o merged
with the base, left and right found in the attached attachment.tar

Expected result:
kdiff3 reports a conflict for the lines
  procedure-5.5
  procedure-5.6

Actual result:
No conflict is reported; if --auto is provided, merge silently succeeds and outputs the "merged" file found in the attached "attachment.tar", where the two lines
  procedure-5.5
  procedure-5.6
simply appear in the middle of nowhere, outside of any function.

kdiff3: 0.9.96 on Ubuntu Linux