Date: Thu, 13 Apr 2006 00:23:04 -0700 From: Gordon Tetlow <gordon@tetlows.org> To: arch@freebsd.org Cc: Doug Barton <dougb@freebsd.org> Subject: Mergemaster enhancement Message-ID: <443DFC58.6060502@tetlows.org>
next in thread | raw e-mail | index | archive | help
I've thrown together a quick mergemaster enhancement that will automagically upgrade files that have changed in the /usr/src/etc distribution but the user hasn't changed. Great applications are for when you trust that we aren't going to break everything and only don't want mergemaster to squash files that you have customized. Patch location: http://people.freebsd.org/~gordon/patches/mergemaster.mtree.diff How it works: Through clever use of mtree, I build an mtree description of everything that make distribution installs (only size and md5) from the temproot. When the user completes a mergemaster run, the mtree description file gets installed into /var/db for safe-keeping. When the user then decides to do a subsequent upgrade (with the -U flag), the existing mtree description from /var/db is called into service looking for files that are different in DESTDIR. This is stashed away until a file that would normally end up prompting you to look at changes is encountered. Since there are no user modified changes, the new file is installed without bothering the user. Let me know what you think. Thanks, -gordon
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?443DFC58.6060502>