Re: merging

[Laird Nelson]

Larry Jones wrote:
> 
> Moshe Levy writes:
> >
> > So, how do i avoid the automated deletions in the merge ? i think the cvs
> > should atleast warn or do a diff on that kind of a change.
> 
> You don't.  As far as CVS is concerned, a change is just deleting some
> old lines and inserting some new lines; what's so special about the case
> where there aren't any new lines?

Not only that, but I'd hate to have my recoverable builds based on a
tool that didn't track deletions!

Cheers,
Laird