Merge Parts Of A CWS Into Another CWS

From OpenOffice.org Wiki

It's quite common that a single or a group of fixes done on a CWS is needed in another CWS but the originating CWS is far from being ready. In many cases it's possible to merge the fixes into the target CWS without risking severe trouble with conflicts on integration day. The key to success is to take the changes verbatim from the originating CWS and resist the urge to beautify the code by changing indentation, comments etc.

The easiest way to merge the changes is to use the merge feature of CVS. For this you need to identify the branch and the anchor tag of the originating CWS.

Example: let's say we want to merge changes from CWS foo into our CWS.

• identify the branch and anchor tags of CWS foo:

        $ cvs log file | grep -i foo
                CWS_SRC680_FOO_ANCHOR: 1.2
                cws_src680_foo: 1.2.0.8

• merge the changes:

        $ cvs update -kk -jCWS_SRC680_FOO_ANCHOR -jcws_src680_foo file

• resolve conflicts
• commit changes to your CWS

The cvs update -j command recurses - as most CVS commands do - through the subdirectories, so its possible to merge a whole module at once.