Bug 19217
| Summary: | Add an IGNORE_LIST to mergemaster. | ||
|---|---|---|---|
| Product: | Base System | Reporter: | sean <sean> |
| Component: | conf | Assignee: | Doug Barton <dougb> |
| Status: | Closed FIXED | ||
| Severity: | Affects Only Me | ||
| Priority: | Normal | ||
| Version: | 4.0-STABLE | ||
| Hardware: | Any | ||
| OS: | Any | ||
State Changed From-To: open->suspended The author of mergemaster would like to implement this change, but will be doing this differently Responsible Changed From-To: freebsd-bugs->billf I'm co-maintainer of mergemaster Responsible Changed From-To: billf->dougb I am a committer now This idea is going to be implemented through the user having the ability to add custom scripts of their own invention to their mm run. I'm leaving it suspended till I actually get those bits committed. State Changed From-To: suspended->closed Instead of adding this specific functionality to mm, I decided instead to add more general scripting hooks which will allow the user to specify this kind of functionality, as well as others. The code to do this has been committed to RELENG_5, and will be MFC'ed asap. |
It would be nice to have the option of forcing mergemaster to ignore certain critical files to speed up the process. This would allow for greater administrative flexibility. Fix: The following patch to meremaster creates an IGNORE_LIST supplied from the administrator's/root's .mergemasterrc file. And here is an excerpt from my .mergemasterrc showing how I use this: IGNORE_LIST=".cshrc \ .login \ etc/aliases \ etc/csh.cshrc \ etc/csh.login \ etc/dhclient.conf \ etc/group \ etc/host.conf \ etc/hosts \ etc/hosts.allow \ etc/hosts.equiv \ etc/hosts.lpd \ etc/mail/sendmail.cf \ etc/master.passwd \ etc/newsyslog.conf \ etc/printcap \ etc/ssh/ssh_config \ etc/ssh/sshd_config \ etc/syslog.conf \ etc/ttys \ root/.cshrc \ root/.login" #--KVBo6jBgLBwYXzSXlzSnztdOXGlJ2CclnSYt0rTebD72wsR5 Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" --- mergemaster.sh.orig Thu Mar 2 17:31:36 2000 +++ mergemaster.sh Thu Apr 13 23:21:24 2000 @@ -260,6 +260,16 @@ ;; esac + # Like to have a list of files that we really don't want to have + # mergermaster hassle us about. + case "${IGNORE_LIST}" in + '') ;; + *) for IGNORED in ${IGNORE_LIST}; do + rm ${TEMPROOT}/${IGNORED} + done + ;; + esac + ;; # End of the "RERUN" test esac How-To-Repeat: Run megemaster :)