Feature request: improved configuration file merge

[lifanov]

Currently, configuration merge is neither verbose nor interactive. Something like mergemaster (interactive) or "etcupdate diff" is necessary to have confidence in package updates that modify configuration. This is doubly so for configuration in /etc (pkgbase).

Please be verbose when editing user configuration on update or creating a .pkgnew file and also provide something like "pkg diff/resolve" for viewing and/or resolving configuration differences.

[grahamperrin]

… in /etc (pkgbase). …

An edge case, involving a hard link elsewhere:

• ⚙ D45377 pkgbase: Fix csh /root/.cshrc (abandoned) ▶ ⚙ D45382 csh: Remove hardlink /.cshrc
• csh: Remove hardlink /.cshrc · freebsd/freebsd-src@dcb65c5 (2024-05-29)

[grahamperrin]

From https://github.com/FreeBSD/freebsd-ports/commit/460f6d861e431f8952debe0ee74c40a6a6a583e7

• add support for using an external tool for 3 way merge (Sponsored by Serenity Cyber Security, LLC)

https://github.com/freebsd/pkg/compare/1.21.3...2.0.0 includes:

• Add support for using external 3-way merge tool when handling @config… · freebsd/pkg@19d215b

Sponsored by: Future Crew, LLC

@bapt please, are Future Crew and Serenity Cyber Security somehow synonymous with each other?

[grahamperrin]

https://github.com/freebsd/pkg/issues/1405#issue-138211681

… doubly so for configuration in /etc (pkgbase). …

FYI pkgbasify https://github.com/ifreund/pkgbasify?tab=readme-ov-file#behavior includes three-way-merge.