From owner-freebsd-current@FreeBSD.ORG Thu Jun 10 20:47:55 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AC5F1065676 for ; Thu, 10 Jun 2010 20:47:55 +0000 (UTC) (envelope-from erik@cederstrand.dk) Received: from csmtp2.one.com (csmtp2.one.com [91.198.169.22]) by mx1.freebsd.org (Postfix) with ESMTP id 941648FC14 for ; Thu, 10 Jun 2010 20:47:54 +0000 (UTC) Received: from macfeast.lan (0x573b9942.cpe.ge-1-2-0-1101.ronqu1.customer.tele.dk [87.59.153.66]) by csmtp2.one.com (Postfix) with ESMTP id 00B1A1B00302D; Thu, 10 Jun 2010 20:47:52 +0000 (UTC) Mime-Version: 1.0 (Apple Message framework v1078) Content-Type: multipart/signed; boundary=Apple-Mail-250--604554063; protocol="application/pkcs7-signature"; micalg=sha1 From: Erik Cederstrand In-Reply-To: <4C114B8C.70407@intertainservices.com> Date: Thu, 10 Jun 2010 22:47:52 +0200 Message-Id: References: <201006101346.59824.jhb@freebsd.org> <4C113342.7070804@icyb.net.ua> <4C114B8C.70407@intertainservices.com> To: Mike Jakubik X-Mailer: Apple Mail (2.1078) X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: freebsd-current@freebsd.org Subject: Re: RFC: etcupdate tool in base? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 10 Jun 2010 20:47:55 -0000 --Apple-Mail-250--604554063 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii Den 10/06/2010 kl. 22.31 skrev Mike Jakubik: > On 6/10/2010 2:47 PM, Andriy Gapon wrote: >> on 10/06/2010 21:29 Eitan Adler said the following: >> =20 >>> -1 unless mergemaster is replaced. >> Have you tried etcupdate? >> etcupdate and mergemaster have a similar function but do things in = quite a >> different way. While one is intended to be more interactive, the = other is more >> automated. They can not replace each other. >> =20 >=20 > -1 Also. >=20 > How does this differ from a "mergemaster -iFU" ? That's pretty much as = automated as it can get. I find the ability to do 'etcupdate diff' to quickly get an overview of = which changes I have made to a standard installation very useful. Looking from the outside, I think the two tools could be merged to a = single upgrade tool. I see three uses for such a tool: * Show me which local modifications I have, so I can see if they're = still relevant for the upgraded system * Just do all the hard work for me (i.e. mergemaster -iFU) on files I = didn't change * Guide me through merging updates to files I did modify myself (and = please, don't ask me innocently if I want to delete my local account = when it's 4 AM :-) I may be answering 'yes' in my sleep) +1 from me on etcupdate in base. Erik= --Apple-Mail-250--604554063--