Date: Tue, 22 Apr 2003 14:33:12 +0200 (CEST) From: Alban Hertroys <dalroi@solfertje.student.utwente.nl> To: Doug Barton <DougB@freebsd.org> Cc: freebsd-stable@freebsd.org Subject: Re: Mergemaster Request (RE: mergemaster tips) Message-ID: <20030422123625.2F698ED@solfertje.student.utwente.nl> In-Reply-To: <20030420161118.P631@znfgre.tberna.bet>
next in thread | previous in thread | raw e-mail | index | archive | help
On 20 Apr, Doug Barton punched keys in this particular order: > On Mon, 21 Apr 2003, Marc Schneiders wrote: >> 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. > > Doug Wouldn't it be easier to use CVS to "backup" your /etc? That way you will have an archive of the actual changes, instead of the changed files. The extra work involved seems minimal (do an import now, do commits after every mergemaster). I think it would be difficult to drop very old backups that way, though... And you'll probably want to have the CVS repository on a different machine. Just some thought. -- Alban Hertroys http://solfertje.student.utwente.nl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No, it's not a bug! It's a six-legged feature!
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030422123625.2F698ED>