pkg 1.4 freeze please test test test!

Baptiste Daroussin bapt at
Wed Oct 29 20:08:50 UTC 2014

On Wed, Oct 29, 2014 at 01:05:49PM -0700, Anton Afanasyev wrote:
> On Tue, Oct 28, 2014 at 4:19 PM, Baptiste Daroussin <bapt at>
> wrote:
> > - new 3 way merge code ("stolen" from the fossil-scm) to allow automerging
> >   configuration files
> > - new @config keyword to mark a file as a config file (during
> >   upgrade/reinstallation it will try to merge the configuration with the
> > one the
> >   user may have modified) an option AUTOMERGE is available to prevent
> >   automerging if automerge fails a .pkgnew file will be created along with
> > the
> >   untouched user version of the configuration
> >
> Would it make sense to let the user specify the merge tool to use and
> always use it, instead of having to support the merge code within pkg?

That will defeat cross installation/upgrades (install arm package in an arm chroot)

but yes allowing a users to define their own merge tool in general instead of
the internal one could make sense.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <>

More information about the freebsd-current mailing list