[Insight-developers] cvs merging

[Damion Shelton]

Hi all...

Couple of questions about the way CVS handles merging file revisions. To use
an example, Bill made some changes to itkBloxCoreAtomImage:

my original version
v1.1 TBoundaryPointImage::Pointer m_BoundaryPointImage

Bill's change (to fix missing typename)
v1.2 typename TBoundaryPointImage::Pointer m_BoundaryPointImage;

My update, which fixed some other stuff
v1.3 TBoundaryPointImage::Pointer m_BoundaryPointImage;

My modifications were made to version 1.1, and I assumed that Bill's changes
would be preserved. That didn't happen though. So, I redid Bill's changes
for the next version:

v1.4 typename TBoundaryPointImage::Pointer m_BoundaryPointImage;

My question is, Is this normal behavior for CVS, or am I doing something
wrong? How do we ensure that versions are successfully merged (I'm using
WinCVS, incidentally, if that affects anything).

Thanks,

-Damion-