[Insight-developers] cvs merging

[Ken Martin]

#1 rule in CVS, never copy a file on top of a cvs file. I think every
example of changes getting accidentally removed involves cp. My guess
is that somehow steps e and d were reversed which would delete the 1.2
changes.

Ken

> 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