[Insight-developers] cvs merging

[Lorensen, William E (CRD)]

If you updated to version 1.2 then copied your file into the Insight directory you would wipe out
Bill's changes.

It is dangerous to edit files outside of the checkedout copy.

Bill


-----Original Message-----
From: Damion Shelton [mailto:dmsst59+@pitt.edu]
Sent: Thursday, June 21, 2001 1:50 PM
To: Miller, James V (CRD); 'insight-Developers'
Subject: Re: [Insight-developers] cvs merging


Here's what I did...

a) I created the original v1.1
b) Bill modifies v1.1 to add the typename lines, and updates the repository
version to 1.2
c) I modify v1.1 to add extra functionality, but don't add the typename
lines
d) I copy my modified v1.1 into the Insight directory
e) I update my local version to v1.2 resulting in a merge
f) I commit the repository version to v1.3, resulting in the removal of
Bill's changes

I looked at what WinCVS is doing and it appears to just do a normal
"commit -m", not -f. Anyways, I'll pay better attention next time I commit
changes to see what happens. I don't recall it mentioning any conflicts when
I did the update though.

-Damion-

----- Original Message -----
From: "Miller, James V (CRD)" <millerjv@crd.ge.com>
To: "'Damion Shelton'" <dmsst59@pitt.edu>; "'insight-Developers'"
<insight-developers@public.kitware.com>
Sent: Thursday, June 21, 2001 1:08 PM
Subject: RE: [Insight-developers] cvs merging


> CVS should have forced you to update your version to v1.2 prior to being
able to commit your changes.
> Did this happen?
>
> If both you and Bill had changed the same line of code (or moved that
code), then you may have gotten
> a conflict when updating.  The conflicting region should have demarked
>
> <<<<<<<<
> line from one version
> =========
> line from the other version
> >>>>>>>>
>
> and it is up to you to pick the right line of code to accept for the new
version you are about to
> checkin.
>
> I don't think WinCVS should cause a problem unless it does something like
a "commit -f" to force your
> version into the repository.
>
>
>
>
> -----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
>


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