One caution - if you use CVS keywords in your files, they will of course be different.
On the merge of the branch into the trunk, you will see conflict messages for the files where the keywords conflict.
To avoid these conflicts, update with just the keywords themselves and not their values using -kk:
$ cvs update -kk -j Release-2-1-fix1