diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2006-04-13 04:12:38 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2006-04-13 04:12:38 +0000 |
| commit | b016b4a6093d851f23e2b8536c356732069b9edb (patch) | |
| tree | 2b01ed135ef32ca33fae0aa27537d930c1d182c0 /contrib | |
| parent | 3306231308751b12907b9b0de51f4dfea0f53d4b (diff) | |
| download | FreeBSD-src-b016b4a6093d851f23e2b8536c356732069b9edb.zip FreeBSD-src-b016b4a6093d851f23e2b8536c356732069b9edb.tar.gz | |
Add a note regarding bumping the freebsd*mc files for mergemaster's sake.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/sendmail/FREEBSD-upgrade | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/sendmail/FREEBSD-upgrade b/contrib/sendmail/FREEBSD-upgrade index 772435c..9674904 100644 --- a/contrib/sendmail/FREEBSD-upgrade +++ b/contrib/sendmail/FREEBSD-upgrade @@ -24,6 +24,10 @@ Imported using: cvs import -m 'Import sendmail 8.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 branch (aka HEAD). Never make local changes on the vendor (SENDMAIL) @@ -93,4 +97,4 @@ infrastructure in FreeBSD: usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -22-March-2006 +12-April-2006 |
