From owner-freebsd-ports@FreeBSD.ORG Wed Oct 29 20:08:50 2014 Return-Path: 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 66CA52BC; Wed, 29 Oct 2014 20:08:50 +0000 (UTC) Received: from mail-wi0-x232.google.com (mail-wi0-x232.google.com [IPv6:2a00:1450:400c:c05::232]) (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 C9970E54; Wed, 29 Oct 2014 20:08:49 +0000 (UTC) Received: by mail-wi0-f178.google.com with SMTP id q5so5603429wiv.17 for ; Wed, 29 Oct 2014 13:08:48 -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=JrOKjwVDW6pgNB5XnBf6zGdu6qqAa9aOcbA2Gwcr3pM=; b=z80+38fAlGoRqzSjR6SAtnwVLEbxirGV7v4h0OTsDadYQHXWNzjXSu1dUu32nZPESY VYEjfnFjX4ANK5aluBGvHlZJBufIbVMXyOzPZ0leyLC75n0AlDJ8wHu+923k0VTSSuyq r0/4NuYqpnDzAWRyjb+jI8dElC+bDtt9l+VdQc5AX0GLLdw6wX/uYS1bV3Z1nuUeCejQ E9U/2kJwOU0CmIX9I+BM82LHXpexJviNtKFODjmoeFuJx7cmMbDcH15yT10loGjcLzZY um7poKU4DmYkkjbUJRAlw8IOhp/9azzj9ZRDeF7f6v39sbjiOpGWnH7ADH9GQC1Z0TNM UMaw== X-Received: by 10.180.91.49 with SMTP id cb17mr14480669wib.30.1414613328010; Wed, 29 Oct 2014 13:08:48 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id wx3sm6293006wjc.19.2014.10.29.13.08.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Oct 2014 13:08:47 -0700 (PDT) Sender: Baptiste Daroussin Date: Wed, 29 Oct 2014 21:08:45 +0100 From: Baptiste Daroussin To: Anton Afanasyev Subject: Re: pkg 1.4 freeze please test test test! Message-ID: <20141029200844.GG11033@ivaldir.etoilebsd.net> References: <20141028231933.GG26796@ivaldir.etoilebsd.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="RMedoP2+Pr6Rq0N2" 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-ports@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Oct 2014 20:08:50 -0000 --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 > 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--