Date: Wed, 29 Oct 2014 21:23:56 +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: <20141029202355.GI11033@ivaldir.etoilebsd.net> In-Reply-To: <CAEAhP2im4Pb%2BtV8JFNrHc=wpP%2BmJwd=UKh5MEz%2B1teD5VZO_Xw@mail.gmail.com> References: <20141028231933.GG26796@ivaldir.etoilebsd.net> <CAEAhP2hEXzttTFxQJXrzL52ft5%2BoDa7h06hBpGy3BS-vFUSGQA@mail.gmail.com> <20141029200844.GG11033@ivaldir.etoilebsd.net> <CAEAhP2im4Pb%2BtV8JFNrHc=wpP%2BmJwd=UKh5MEz%2B1teD5VZO_Xw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--9iyR+p8Z2cn535Lj
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Wed, Oct 29, 2014 at 01:22:01PM -0700, Anton Afanasyev wrote:
> On Wed, Oct 29, 2014 at 1:08 PM, Baptiste Daroussin <bapt@freebsd.org>
> wrote:
>=20
> > 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:
> > >
> > > > - 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 preve=
nt
> > > > automerging if automerge fails a .pkgnew file will be created alo=
ng
> > 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 inst=
ead
> > of
> > the internal one could make sense.
> >
> > regards,
> > Bapt
> >
>=20
> I (and this is just a personal opinion of one man, of course) find it
> better to be explicitly told that "this default config file has changed a=
nd
> you need to review it and merge with your local changed copy, even if you
> didn't make any drastic changes to your version", as opposed to "by the
> way, we merged a new version of this config file with your changes", as
> that forces one to know what and why has changed. I've already lost a
> config file for one of my ports (squid, the last 2.something version) due
> to it getting overwritten with the default, so wouldn't want anything like
> that to happen again (and yes, I know, I must have backups; but that's not
> the point here).
>=20
> If auto-merging is going to stay, an option to turn it off and always use=
a
> merge tool or perform the merge manually would be appreciated.
there is an option to turn it off as I said in the announcement:
AUTOMERGE: false
in pkg.conf
regards,
Bapt
--9iyR+p8Z2cn535Lj
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iEYEARECAAYFAlRRTNsACgkQ8kTtMUmk6EywOgCdGLcpVezDDHZKXXkyt3w3q4CE
98EAnRWQ4Syfzcc80XTva/QzK/YWDaYT
=HWgL
-----END PGP SIGNATURE-----
--9iyR+p8Z2cn535Lj--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20141029202355.GI11033>