[Insight-developers] cvs merging

[Lorensen, William E (CRD)]

Sounds like you are doing something wrong.

What cvs commands are you using. WHen you did a cvs update, did cvs say it was merging?

Bill

-----Original Message-----
From: Damion Shelton [mailto:dmsst59+@pitt.edu]
Sent: Thursday, June 21, 2001 12:27 PM
To: 'insight-Developers'
Subject: [Insight-developers] cvs merging


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-


_______________________________________________
Insight-developers mailing list
Insight-developers@public.kitware.com
http://public.kitware.com/mailman/listinfo/insight-developers