[Bug 256606] textproc/kdiff3: missing/extra newlines when merging

From: <bugzilla-noreply_at_freebsd.org>
Date: Mon, 14 Jun 2021 17:20:23 +0000

            Bug ID: 256606
           Summary: textproc/kdiff3: missing/extra newlines when merging
           Product: Ports & Packages
           Version: Latest
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Only Me
          Priority: ---
         Component: Individual Port(s)
          Assignee: kde_at_FreeBSD.org
          Reporter: emaste_at_freebsd.org
             Flags: maintainer-feedback?(kde_at_FreeBSD.org)
          Assignee: kde_at_FreeBSD.org

kdiff3 1.9.2 on FreeBSD 13.0 + some minor kernel changes

Using kdiff3 for resolving git merge conflicts I noticed that output files
sometimes have extra whitespace, and are missing a newline at EOF. I
encountered this within the last month or two.

Reproduction steps - create test files:

printf 'line 1\nline 2-base\nline 3-base\nline 4\n' > base
printf 'line 1\nline 2-theirs\nline 4\n' > theirs
printf 'line 1\nline 2-mine\nline 4\n' > mine

Invoke kdiff3:

kdiff3 -o out base theirs mine

Resolve the conflict choosing 'mine', save output

Observe that the output file has a blank 3rd line, and has no \x0a at EOF. By
default I have LANG=en_CA.UTF-8 but observed also with LANG unset.

You are receiving this mail because:
You are the assignee for the bug.
Received on Mon Jun 14 2021 - 17:20:23 UTC

Original text of this message