From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by nuthatch.gentoo.org with esmtp (Exim 4.43) id 1DxB8U-0005wJ-Uh for garchives@archives.gentoo.org; Mon, 25 Jul 2005 22:09:23 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.13.4/8.13.4) with SMTP id j6PM82cF030659; Mon, 25 Jul 2005 22:08:02 GMT Received: from mailserv.unb.ca (mailserv.unb.ca [131.202.3.23]) by robin.gentoo.org (8.13.4/8.13.4) with ESMTP id j6PM81b4024535 for ; Mon, 25 Jul 2005 22:08:01 GMT Received: from jupiter.csd.unb.ca (fellows@jupiter.sun.csd.unb.ca [131.202.3.8]) by mailserv.unb.ca (8.13.1/8.13.1) with SMTP id j6PM7w9d014689; Mon, 25 Jul 2005 19:07:58 -0300 Message-Id: <200507252207.j6PM7w9d014689@mailserv.unb.ca> Received: by jupiter.csd.unb.ca (sSMTP sendmail emulation); Mon, 25 Jul 2005 19:07:58 -0300 To: gentoo-amd64@lists.gentoo.org, Gen Zhang In-reply-to: <1122322101.20677.18.camel@enlil> References: <1f81f7e0050724083428e7d678@mail.gmail.com> <42E3B833.7070804@liquidcomputing.co.uk> <1122322101.20677.18.camel@enlil> Comments: In-reply-to Gen Zhang message dated "Mon, 25 Jul 2005 21:08:21 +0100." Date: Mon, 25 Jul 2005 19:07:57 -0300 From: David Fellows X-UNB-MailScanner-Information: Please contact the ISP for more information X-UNB-VirusScanner: Found to be clean X-UNB-SpamDetails: X-MailScanner-From: fellows@unb.ca Subject: Re: [gentoo-amd64] Maybe a new etc-update is needed? Was: problem after emerge --update world Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-amd64@gentoo.org Reply-to: gentoo-amd64@lists.gentoo.org X-Archives-Salt: 9fe331df-6ff3-4ab8-8796-7b28beb4f7cc X-Archives-Hash: cf84ba7aed955b29d733d5ee7a58224f > Ditto for here. However, I was thinking of implementing something more > intelligent, based around a 3-way merge. It's just a quick and dirty > script that scans for updates, ala etc-update, then calls out to > something a little more appropriate, like meld or xxdiff. It would keep > a copy of the 'vanilla' config files in /.etc (or something), and > attempt 3-way merges, assuming that /.etc/config is the common ancestor > of /etc/config and /etc/.config000 (I forget exactly how portage names > them); after a successful merge it would move the new vanilla file > to /.etc. > > I hope that makes sense. > > Any comments? Do man dispatch-conf first. :-) Not that it is perfect by any means. Dave F -- gentoo-amd64@gentoo.org mailing list