From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26956 invoked by uid 1002); 13 Apr 2003 16:07:31 -0000 Mailing-List: contact gentoo-dev-help@gentoo.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@gentoo.org Received: (qmail 27921 invoked from network); 13 Apr 2003 16:07:30 -0000 Date: Sun, 13 Apr 2003 12:07:28 -0400 From: Jon Portnoy To: Brian Harring Cc: gentoo-dev@gentoo.org Message-ID: <20030413160728.GA2956@cerberus.oppresses.us> References: <200304130457.20196.bdharring@wisc.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200304130457.20196.bdharring@wisc.edu> User-Agent: Mutt/1.5.4i Subject: Re: [gentoo-dev] etc-update X-Archives-Salt: 3b0971b6-000c-4d34-a386-e19abd446181 X-Archives-Hash: 89522d40d428e73d948eb9bbd9472867 "Interactively merge changes" does exactly that (uses diff/patch) On Sun, Apr 13, 2003 at 04:57:20AM -0500, Brian Harring wrote: > While I'm on an emailing spree, anyone got any ideas on how to make etc-update > a bit less painful? > It seems like a lot of the times where etc-update requires user intervention > it's fairly minor- case in point, make.conf, when the default/base-layout > make.conf gets updated. It seems like it usually chokes on configured > options, features or gentoo_mirrors as an example. > > What if we were to either A) maintain a listing of default conf files (when > modifying/adding a conf file, make.conf again, store it somewhere), or B) > pull the conf from the distfile in some way? The reason I ask is it strikes > me if etc-update where able to compare the old default conf against the > current conf it might be able to create a diff it could use to patch against > the new one. A bit wordy, but basically I'm wondering if we could isolate > the changes a user has made, and attempt to merge those changes into the new > conf file via a diff. > The problem I see with this would be that where (say GENTOO_MIRRORS) gets > updated to some new default setting, the generated diff wouldn't be able to > match against the new conf. > Thoughts? > ~harring > bdharring@wisc.edu > > -- > gentoo-dev@gentoo.org mailing list -- Jon Portnoy avenj/irc.freenode.net -- gentoo-dev@gentoo.org mailing list