2 Commits

Author	SHA1	Message	Date
des	a5f4b9478d	Update the pre- and post-merge scripts to work correctly after the recent ... cleanup. A round-trip (./freebsd-pre-merge.sh ; ./freebsd-post-merge.sh) now results in an unchanged working copy.	2016-01-19 12:38:53 +00:00
des	fc833dce1b	Add a pre-merge script which reverts mechanical changes such as added ... $FreeBSD$ tags and man page dates. Add a post-merge script which reapplies these changes. Run both scripts to normalize the existing code base. As a result, many files which should have had $FreeBSD$ tags but didn't now have them. Partly rewrite the upgrade instructions and remove the now outdated list of tricks.	2014-03-24 19:15:13 +00:00