From owner-freebsd-ports@FreeBSD.ORG  Wed Oct 29 20:06:11 2014
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: ports@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 02428C4;
 Wed, 29 Oct 2014 20:06:11 +0000 (UTC)
Received: from mail-qc0-x22f.google.com (mail-qc0-x22f.google.com
 [IPv6:2607:f8b0:400d:c01::22f])
 (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 96BC5E2F;
 Wed, 29 Oct 2014 20:06:10 +0000 (UTC)
Received: by mail-qc0-f175.google.com with SMTP id b13so3412583qcw.6
 for <multiple recipients>; Wed, 29 Oct 2014 13:06:09 -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=PrE4UCEpq205m/AtC0Ay3VU9cJpxhtR1+EHxeqCXKto=;
 b=lOh8QQ1u129bPJt8YPhlaOR5R9CwYR55sz0sH/QIVKYzQculzhe6IBBi8PzlbdxLWX
 5Mr1ADS6R9qyw8sAitNJTyE2shfkkOLL8RCPRRV1+o0R8hwYyhhgG+Vweu3Ofiub9kVF
 6x9Ek+2F7TJ/Sj22Nf84hu6Tn5QnjAodmIS03pGKi4yL7Oby5bBGc9wLmldGlojMCeJj
 ClPcm4ASwMvHi2Hzx/msEiTPdFtRDfdHN/dW10SSd3UoTDzkOomSBTRvLLbFY5BLaZk+
 fnPgTcBd4oTF3dxS5bkoAtBY+4vO40JsA0x9ZmNfFaJn0V/xaRW4bjOyej91GmxGmfw5
 4zxA==
X-Received: by 10.140.102.7 with SMTP id v7mr18068450qge.68.1414613169599;
 Wed, 29 Oct 2014 13:06:09 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.229.3.2 with HTTP; Wed, 29 Oct 2014 13:05:49 -0700 (PDT)
In-Reply-To: <20141028231933.GG26796@ivaldir.etoilebsd.net>
References: <20141028231933.GG26796@ivaldir.etoilebsd.net>
From: Anton Afanasyev <aasoft@gmail.com>
Date: Wed, 29 Oct 2014 13:05:49 -0700
Message-ID: <CAEAhP2hEXzttTFxQJXrzL52ft5+oDa7h06hBpGy3BS-vFUSGQA@mail.gmail.com>
Subject: Re: pkg 1.4 freeze please test test test!
To: Baptiste Daroussin <bapt@freebsd.org>,
 "ports@freebsd.org" <ports@freebsd.org>, current@freebsd.org
Content-Type: text/plain; charset=UTF-8
X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports/>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Oct 2014 20:06:11 -0000

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