Date: Wed, 29 Oct 2014 21:08:45 +0100 From: Baptiste Daroussin <bapt@freebsd.org> To: Anton Afanasyev <aasoft@gmail.com> Cc: "ports@freebsd.org" <ports@freebsd.org>, current@freebsd.org Subject: Re: pkg 1.4 freeze please test test test! Message-ID: <20141029200844.GG11033@ivaldir.etoilebsd.net> In-Reply-To: <CAEAhP2hEXzttTFxQJXrzL52ft5%2BoDa7h06hBpGy3BS-vFUSGQA@mail.gmail.com> References: <20141028231933.GG26796@ivaldir.etoilebsd.net> <CAEAhP2hEXzttTFxQJXrzL52ft5%2BoDa7h06hBpGy3BS-vFUSGQA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--RMedoP2+Pr6Rq0N2
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
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@freebsd.org>
> wrote:
>=20
> > - new 3 way merge code ("stolen" from the fossil-scm) to allow automerg=
ing
> > 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 w=
ith
> > 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.
regards,
Bapt
--RMedoP2+Pr6Rq0N2
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iEYEARECAAYFAlRRSUwACgkQ8kTtMUmk6EzxHACgiKiCZLXM8w1Fk9G3BwwZ+NVi
v2kAn34fNwboZbMU3kSh+tZFOt3TqSM6
=W1c1
-----END PGP SIGNATURE-----
--RMedoP2+Pr6Rq0N2--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20141029200844.GG11033>