Date: Wed, 14 Feb 2001 10:34:25 -0600 From: Stephen Montgomery-Smith <stephen@math.missouri.edu> To: freebsd-stable@FreeBSD.ORG Subject: Different approach to mergemaster Message-ID: <3A8AB391.12D1D822@math.missouri.edu>
next in thread | raw e-mail | index | archive | help
Before mergemaster came popular, I developed my own approach to updating /etc which works rather nicely. I never did get around to trying mergemaster, but I see emails where from time to time people have troubles with it, and I thought that I would share my approach. What I have is a seperate directory called /usr/etc-chg. I run cd /usr/src/etc make DESTDIR=/usr/etc-chg/$CURRENTVERSION distrib-dirs distribution where $CURRENTVERSION is some label describing the current make world that I have just done (or about to do). Since I use CTM, this label is the ctm-delta number. But I am sure that other ways could be made. Then I run a script that does the following. First it looks for diffs between /usr/etc-chg/$CURRENTVERSION and /usr/etc-chg/$PREVIOUSVERSION, where $PREVIOUSVERSION is the label for the make world I did before. It looks to see which files between the two versions differ. If they differ, then it looks in /etc to see if the files in /etc and /usr/etc-chg/$PREVIOUSVERSION are the same. If that is the case, then, and only then, it updates /etc. Otherwise it prints out a helpful message (basically telling you to do the update by hand). In this way, files that you have not configured yourself get updated easily. Files that you have configured do not get changed. Thus all your changes don't get lost. I find updating /etc to be a very easy chore. Perhaps you guys might also like this approach, and maybe this could feature could be added in to mergemaster. -- Stephen Montgomery-Smith stephen@math.missouri.edu 307 Math Science Building stephen@showme.missouri.edu Department of Mathematics stephen@missouri.edu University of Missouri-Columbia Columbia, MO 65211 USA Phone (573) 882 4540 Fax (573) 882 1869 http://www.math.missouri.edu/~stephen To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3A8AB391.12D1D822>