From owner-freebsd-stable@FreeBSD.ORG Sun Apr 20 18:55:06 2003 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9A2D37B401; Sun, 20 Apr 2003 18:55:06 -0700 (PDT) Received: from voo.doo.net (voo.doo.net [81.17.45.210]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8361043F75; Sun, 20 Apr 2003 18:55:00 -0700 (PDT) (envelope-from marc@schneiders.org) Received: from localhost (localhost [127.0.0.1]) by voo.doo.net (8.12.8/8.12.6) with ESMTP id h3L1stJe039107; Mon, 21 Apr 2003 03:54:57 +0200 (CEST) (envelope-from marc@schneiders.org) Date: Mon, 21 Apr 2003 03:54:55 +0200 (CEST) From: Marc Schneiders Sender: In-Reply-To: <006701c307a5$ee7948b0$0200a8c0@travel> Message-ID: <20030421034716.W37389-100000@voo.doo.net> X-Preferred-email-to: marc@schneiders.org X-Other-email-to: marc@venster.nl X-Organization: Venster (Zeist - NL) X-URL: http://www.bijt.net/ X-SOA: A.ROOT-SERVERS.ORSC. X-OS: FreeBSD: The Power to Serve MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: 'Doug Barton' cc: freebsd-stable@FreeBSD.org Subject: RE: Mergemaster Request (RE: mergemaster tips) X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Apr 2003 01:55:07 -0000 > [mailto:owner-freebsd-stable@freebsd.org] On Behalf Of Doug Barton > Sent: Sunday, April 20, 2003 4:51 PM > On Mon, 21 Apr 2003, Marc Schneiders wrote: > > I thought this was clever, but I now see this isn't good enough. I do > > not want to get an archive, in addition to normal backups, of a > > complete 10 MB /etc directory each time I upgrade. > > 10 megs!?! Holy code bloat Batman! What the heck do you have in there? > Mine is only 1.3 megs, and that's just because I'm a bit sloppy about > having extra rcNG stuff lying around. Maybe I am sloppy too. /etc/mail is 7 MB. I do a bit of spam fighting and the access database is getting bigger and bigger. > > So here is the feature request: Is it possible to have a new option in > > mergemaster: > > > > -b (path) Make a backup of every file that mergemaster > > overwrites, whether on user input or automatically. > > Mergemaster writes the files in a directory with a > > timestamp name (YYYYMMDD-HHMMSS) under the path > > indicated. > > > > This would give us an archive of the config changes on the machine. > > Very interesting idea. Try the attached patch and let me know what you > think. I used -P for "preserve," because I like the semantics better. > This > is all subject to change since I just whipped this up, but it should be > enough for you to play with. For some weird reason, I did not get your message, but saw only a reply to it. So I don't have the patch :-( And in the archive at www.freebsd.org the attachment looks like a weird patch (to me, stupid): SW5kZXg6IG1lcmdlbWFzdGVyLnNoDQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 DQpSQ1MgZmlsZTogL2hvbWUvbmN2cy9zcmMvdXNyLnNiaW4vbWVyZ2VtYXN0 ZXIvbWVyZ2VtYXN0ZXIuc2gsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjYu Mi4xNw0KZGlmZiAtdSAtcjEuNi4yLjE3IG1lcmdlbWFzdGVyLnNoDQotLS0g Maybe a retry will help?