Howto merge local changes with new RTEMS versions using CVS
-----------------------------------------------------------

- unpack RTEMS tarball and import RTEMS to our repository:

tar xjf rtems-4.6.5.tar.bz2
cd rtems-4.6.5
cvs import -m "Sources from RTEMS 4.6.5" RTEMS RTEMSSRC V04-06-05

- patch gen405 BSP:

cd ..
cvs co -ko RTEMS
cd RTEMS
patch -p0 < ../rtems-4.6.5.diff

- find which files were patched, commit and tag them:

cvs -n update
cvs add <patchedfiles>
cvs ci -m "Apply gen405 patch"
cvs tag V04-06-05-gen405

- find which files we customized:

cd ..
diff -urN --exclude-from=./diff-exclude-files RTEMS <my-rtems-4.6.5-ml405> > /tmp/rtems-4.6.5-ml405.diff

- copy our own customized files, then commit:

cd RTEMS
<copy custom files>
cvs ci -m "Changes required by ml405 board"

- update 4.6.5 to 4.6.6 (*):

cvs co -ko -r V04-06-05 RTEMS
cd RTEMS
patch -p1 < ../rtems-4.6.5-4.6.6.diff
cvs import -m "Sources from RTEMS 4.6.6" RTEMS RTEMSSRC V04-06-06

- merge the HEAD with V04-06-05 and V04-06-06:

cd ..
mv RTEMS rtems-4.6.6
cvs co -ko -jV04-06-05 -jV04-06-06 RTEMS




--- 
(*) NOTE: before patching, to get automatic files which are otherwise
ignored by CVS and cause patch to fail, I did (revisit):

mv RTEMS rtems-4.6.5
tar xjf ../rtems-packages/rtems-4.6.5.tar.bz2
mv rtems-4.6.5 RTEMS

maybe just running ./bootstrap would have been better


---
diff-exclude-files:

CVS
*.in
aclocal.m4
autom4te*.cache
config.cache
config.guess
config.log
config.status
config.sub
configure
depcomp
install-sh
install.sh
Makefile
Makefile.in
mdate-sh
missing
mkinstalldirs
texinfo.tex
setup.texi