[Bug 253108] freebsd-update calling non-existing "merge" command

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=253108

            Bug ID: 253108
           Summary: freebsd-update calling non-existing "merge" command
           Product: Base System
           Version: 12.1-RELEASE
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Only Me
          Priority: ---
         Component: bin
          Assignee: bugs at FreeBSD.org
          Reporter: db_freebsd at m4x.org

In the process to upgrade from 12.1-RELEASE-p13 to 12.2-RELEASE, the
freebsd-update command fails during the configuration merge phase. The merged
files proposed are all empty.

After looking at the code, it appears that the script calls the "merge"
command, which doesn't exist on my system.

I've manually change the script to use diff3, which solved the issue (inspired
from the latest version of freebsd-update on github using diff3).

ls on freebsd-update:
-r-xr-xr-x  1 root  wheel  -   90K Oct 12  2019 /usr/sbin/freebsd-update*

file version extracted from first lines:
# $FreeBSD: releng/11.3/usr.sbin/freebsd-update/freebsd-update.sh 345802
2019-04-02 13:58:31Z emaste $

-- 
You are receiving this mail because:
You are the assignee for the bug.