From owner-freebsd-current@FreeBSD.ORG Wed Oct 29 20:22:23 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B6F44BC7; Wed, 29 Oct 2014 20:22:23 +0000 (UTC) Received: from mail-qa0-x231.google.com (mail-qa0-x231.google.com [IPv6:2607:f8b0:400d:c00::231]) (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 56AD08E; Wed, 29 Oct 2014 20:22:23 +0000 (UTC) Received: by mail-qa0-f49.google.com with SMTP id i13so2708624qae.22 for ; Wed, 29 Oct 2014 13:22:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :content-type; bh=Sp2Xy7K+YqjJ3xGsIiRPItID8l1QiD3EM2pdF1950b4=; b=AaUTD3df6VjVvsClGyWLefqNYeGzFX2BLPRMy5IJNuzyBrMKhnootaWv3tjcaPS388 TyCZVlVGl0GkvnCx3ToCm9dFbkhpJnzGGNTc5v05O7PapBawk2XD6ux28E/LSSsIIuJe TiHLjBOg7o/gUh8PBzCUD/bE31F82kkphF2MOEPzMwLLI9joBIY7WLO5ffOtzKDBRccD bWymR9y2wbujbM3Hbmi6MbEXBjIhwqMm2FXQGmhmC10ZQi2c37ubmScE6fPcR79ZGsnN 2zAzUeoviGrt5M29qWv2ceCO8xwGlA9B+hcyUidRa/8EpRHwt42ST0NUopxdjk/GKpMw jfXQ== X-Received: by 10.140.82.144 with SMTP id h16mr18066437qgd.40.1414614141934; Wed, 29 Oct 2014 13:22:21 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.3.2 with HTTP; Wed, 29 Oct 2014 13:22:01 -0700 (PDT) In-Reply-To: <20141029200844.GG11033@ivaldir.etoilebsd.net> References: <20141028231933.GG26796@ivaldir.etoilebsd.net> <20141029200844.GG11033@ivaldir.etoilebsd.net> From: Anton Afanasyev Date: Wed, 29 Oct 2014 13:22:01 -0700 Message-ID: Subject: Re: pkg 1.4 freeze please test test test! To: Baptiste Daroussin , "ports@freebsd.org" , current@freebsd.org X-Mailman-Approved-At: Wed, 29 Oct 2014 21:13:00 +0000 Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 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:22:23 -0000 On Wed, Oct 29, 2014 at 1:08 PM, Baptiste Daroussin wrote: > 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 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. > > regards, > Bapt > 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 and 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). 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. Anton