Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 04 May 2021 12:48:17 +0200
From:      Mathias Picker <>
To:        FreeBSD-QUESTIONS <>
Subject:   freebsd-update in jails: merge fails for files that only differ in rcs?
Message-ID:  <>

Next in thread | Raw E-Mail | Index | Archive | Help
Hi all,

I=E2=80=99m in the process of updating my servers from 12.2-RELEASE-p6 to
13.0-RELEASE. This worked fine for the host. This now runs=20
13-RELEASE, the jails are still running 12.2 world.

For the jais, running

- - - - - - - - -
freebsd-update -b /path/to/jail --currently-running 12.2-RELEASE=20
-r 13.0-RELEASE upgrade
- - - - - - - - -

leads to loads of

- - - -=20
The following file could not be merged automatically: [some config=20
Press Enter to edit this file in vi and resolve the conflicts
- - - - - -=20

for files that differ only in rcs line.

Before spending more time: does anyone know what=E2=80=99s going on here=20
and has an idea how to fix this.
It=E2=80=99s 50+ files per update, that=E2=80=99s a bit too much for 6 jail=

I already looked through freebsd-update, found the samef function,=20
recreated the 12 and 13 files for csh.login and ran only the samef=20
function: this came up ok, i.e. identified both versions as the=20

Where to look next?

The jails are vnet jails set up using jails.conf and bsdinstall,=20
updated before using freebsd-update fetch install, which worked=20
fine, connected to the outsinde via an if_bridge and work fine in=20
all other aspects, i.e. pkg -j jail install whatever works fine,=20
as does pkg -j update, and running web apps reachable from the=20
outside, reaching other jails for api calls, everything works=20

Thanks, Mathias
Mathias Picker

virtual earth Gesellschaft f=C3=BCr Wissens re/pr=C3=A4 sentation mbH
Westendstr. 142
80339 M=C3=BCnchen
089 / 1250 3943

Want to link to this message? Use this URL: <>