From nobody Thu Oct 2 09:54:55 2025 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ccnGB32sgz69TZS for ; Thu, 02 Oct 2025 09:54:58 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ccnGB29cKz3Z1r for ; Thu, 02 Oct 2025 09:54:58 +0000 (UTC) (envelope-from avg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759398898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=asB2to4lEJ8ZLQDY3PVR++5XYWFuQ4ejtocup98f6e0=; b=vijL/BWDtkvT2GwkqtBnY+KJN7it+qkCTkw/bFJy/q5lOSpPkGP8XjTxq1/jK7ZCcp2rfz xw8J3uaGEo+Vlx11DzTqb0BdG4Qgtk3LffJSSuUxaZw6vrkIBCUtfBtq0nsvKPclrjamv8 c55qIC3J6qZ/LDcDHz3K14l/+Z5MnU6K9zXu9koP+Ky5KD1NdW+4LRsoHWsZ/VjAMCTw/+ LIyeF3oP31aYr5zAiF3UInRSWDoPa0Y/xjeTOokBZZKeNX7pz0Zet75Y/Oq1toRqyTSo8G EhL4aVgXJ1nK+YuMJZvUFxpZy3O5GZ5lcPXgmJIIYWHpKt74M+C6LzYXhU9DZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759398898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=asB2to4lEJ8ZLQDY3PVR++5XYWFuQ4ejtocup98f6e0=; b=CKVQwlJlGSMzPvKBYY5ymOWS0GpoefrEMB5CkiVG5c/bHlTlB8sCsDUfLnDzuOKP5XfV65 a8ExNiDzIH3s7M2MUWBoVmozgg2o3j8NtvmwMBBRKAJ3H4qB2aUR2qUZcolqRd6kffJ7XB lGb/gXCb9TeuFO3ULCehtDygPoMTYINLgyPNV+1LRWa1oz858F1aUOi2WMAIfvDp/Z4eCv 4uGw4eUl+cjW50gXnK61jEbUapJMjs3MPG5EtPX185LXyvTWtYzsT77q0Mlv4jpQ1dpcR6 wKZ3AfqJeBIqInlwUuP03x6vLLk2ttlfbhhDssrrg8Fc9u6GI3lVI0tACNiepw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759398898; a=rsa-sha256; cv=none; b=mnKkniyresICwyrha6Z49LSqTanRrGG7RSmbXCbUKTNaQZK+zueW3nfYuLyHEYN92xpF4G 5aZIgP8VKOpWTcoMCMqI27oROES7bI17b1LhYCRWuROn/cZgzn0sEZqpgOrdzPW2tEimJT tuUuadCNJhm5kQwxmJ3OzVWQLVLSrRhpNsSl0VWUb6lUZODVO+nMXU8Ut9c4uTLuy+Eckn 5j/YynJYpefZGHNT68X6dD2DyE/DwMHwFYXuKtmNqZM2BJlLA/vZWnbPM/A2VyouWfJ6rf RwYuRRhfA38HWpGAon7b40uXVtv4Nm2qMRImbEXo5aEeL+aLdqyGB2M/glipMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [192.168.0.88] (unknown [93.188.39.137]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: avg/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ccnG96lrzztRr for ; Thu, 02 Oct 2025 09:54:57 +0000 (UTC) (envelope-from avg@FreeBSD.org) Message-ID: <36501ae5-5d7f-4e4c-8c96-0f1908ce1059@FreeBSD.org> Date: Thu, 2 Oct 2025 12:54:55 +0300 List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: Questions about pkgbase To: freebsd-current@freebsd.org References: <20251002.180121.980053125503545103.yasu@FreeBSD.org> Content-Language: en-US From: Andriy Gapon In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 02/10/2025 12:35, Lexi Winter wrote: > yes, the merge functionality is the same (more or less), but the result > for the user is worse: etcupdate makes it clear which files failed to > merge and offers a manual resolution of the merge with conflict markers, > while pkg just prints a message, which is usually lost in the hundreds > of other messages printed during an upgrade, and requires the user to > manually locate the unmerged files via find / -name '*.pkgnew', then > you only get the old and new files with no way to easily see what has > changed in the new version of the file. (basically, this is a manual > two-way merge.) > > if there's a better way to do this with pkg, i'd definitely like to know > about it. It would be good if pkg installed base configuration files into etcupdate's tree and then a user needed to explicitly run etcupdate to apply configuration updates. But I imagine that this may not be very easy to do and it would create a relatively fragile dependency between pkg and etcupdate. -- Andriy Gapon