Add a note regarding bumping the freebsd*mc files for mergemaster's sake.

This commit is contained in:
Gregory Neil Shapiro 2006-04-13 04:12:38 +00:00
parent 4a3299141b
commit 4377aa4cf4
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=157704

View File

@ -24,6 +24,10 @@ Imported using:
cvs import -m 'Import sendmail 8.13.6' \ cvs import -m 'Import sendmail 8.13.6' \
src/contrib/sendmail SENDMAIL v8_13_6 src/contrib/sendmail SENDMAIL v8_13_6
After importing, bump the version of src/etc/sendmail/freebsd*mc
so mergemaster will merge /etc/mail/freebsd*cf:
cvs commit -f src/etc/sendmail/freebsd*mc
To make local changes to sendmail, simply patch and commit to the main To make local changes to sendmail, simply patch and commit to the main
branch (aka HEAD). Never make local changes on the vendor (SENDMAIL) branch (aka HEAD). Never make local changes on the vendor (SENDMAIL)
@ -93,4 +97,4 @@ infrastructure in FreeBSD:
usr.sbin/mailwrapper/Makefile usr.sbin/mailwrapper/Makefile
gshapiro@FreeBSD.org gshapiro@FreeBSD.org
22-March-2006 12-April-2006