Date: Wed, 29 Oct 2014 13:05:49 -0700 From: Anton Afanasyev <aasoft@gmail.com> To: Baptiste Daroussin <bapt@freebsd.org>, "ports@freebsd.org" <ports@freebsd.org>, current@freebsd.org Subject: Re: pkg 1.4 freeze please test test test! Message-ID: <CAEAhP2hEXzttTFxQJXrzL52ft5%2BoDa7h06hBpGy3BS-vFUSGQA@mail.gmail.com> In-Reply-To: <20141028231933.GG26796@ivaldir.etoilebsd.net>
index | next in thread | previous in thread | raw e-mail
On Tue, Oct 28, 2014 at 4:19 PM, Baptiste Daroussin <bapt@freebsd.org>
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?
Anton
home |
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAEAhP2hEXzttTFxQJXrzL52ft5%2BoDa7h06hBpGy3BS-vFUSGQA>