From owner-freebsd-current@FreeBSD.ORG Wed Oct 29 20:24:01 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 230A7D30; Wed, 29 Oct 2014 20:24:01 +0000 (UTC) Received: from mail-wg0-x233.google.com (mail-wg0-x233.google.com [IPv6:2a00:1450:400c:c00::233]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 85BD4CF; Wed, 29 Oct 2014 20:24:00 +0000 (UTC) Received: by mail-wg0-f51.google.com with SMTP id l18so4190332wgh.10 for ; Wed, 29 Oct 2014 13:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=NA4yVyyfVUV5Y+sPIeeYnLS0WiOc/cGuDTHwFq+A3ZQ=; b=xDQpwvDQ79RfQa/t172wTPyXTxqfCem0OpBeBWkC9H9hj5abbVG/cnwYnKT8gLYtD+ MOfTk45NPXIrs79v41ZHX/bmd2lvyeU2sKh9fKBoXky0QUx0ph7mhBp0CS9yUUSdwWan 1huKuc1lBJUUJiTjKW9O0p6uliXElNqDnN0CAZEvmXLM5DX3kBq4VcGawQJzZiPFMFBe BUdB/B1kHTfM8fSvIs8XhbV8d7sAR8Obt+LCu4BYOoxct/242Kt+JlMV1Ilvt91fzMt2 pwcheJ0tNP/8V/UtPFXzG19gEMRAkucyJZzsM8fv+1//ZK76a/4tL80SLUiNI1FbeZhH lYDw== X-Received: by 10.180.73.19 with SMTP id h19mr37971249wiv.3.1414614238795; Wed, 29 Oct 2014 13:23:58 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id rx8sm1785425wjb.30.2014.10.29.13.23.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Oct 2014 13:23:57 -0700 (PDT) Sender: Baptiste Daroussin Date: Wed, 29 Oct 2014 21:23:56 +0100 From: Baptiste Daroussin To: Anton Afanasyev Subject: Re: pkg 1.4 freeze please test test test! Message-ID: <20141029202355.GI11033@ivaldir.etoilebsd.net> References: <20141028231933.GG26796@ivaldir.etoilebsd.net> <20141029200844.GG11033@ivaldir.etoilebsd.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="9iyR+p8Z2cn535Lj" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Cc: "ports@freebsd.org" , current@freebsd.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Oct 2014 20:24:01 -0000 --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 > 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 > > > 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--