If you get your -current updates via CTM, here is how to keep your
tree in sync with FreeBSD-current.

Suppose you modified file 'foobar' locally and CTM complains about
this (bad MD5) because it wants to patch it. Here's how to merge
CTM and the IPv6 code:

1. extract all the CTM delta with ctm_rmail, but don't apply them.

2. run the "prectm" script on each uncompressed CTM delta (on its
   standard input):
	zcat src-src.XXXX.gz | scripts/prectm
   It will copy back .noipv6 files to .ctm files as needed.

3. apply the CTM deltas:
	zcat src-src.XXXX.gz | ctm -b /usr/src

4. once all the deltas are applied, merge the new changes to your tree:
	scripts/postctm

   If conflicts occur, merge will warn you. You need to resolve these by
   hand

5. you can check you have resolved all the conflicts with:
	scripts/showconf
