I have employed the following (ugly) script for MFC’ing, as I do not want to really make big difference between FreeBSD and my fork version:

%cat /usr/local/bin/retag 
#!/bin/sh

echo Slipping tag for $@  
cvs -d /home/fcvs rtag -d DELPHIJ\_FORK\_BP $@  
cvs -d /home/fcvs rtag -d -B DELPHIJ\_FORK $@  
cvs -d /home/fcvs rtag -rHEAD DELPHIJ\_FORK\_BP $@  
cvs -d /home/fcvs rtag -rDELPHIJ\_FORK\_BP -b DELPHIJ\_FORK $@

Please note that the branch tag, namely, DELPHIJ_FORK, is moved. So this does not apply to those I have locally changed (and should be branch) source code.

I should have a better way to teach CVS to report the tag slip through mail.