[cvsnt] Re: Branch merging - this seems wrong...

[Tony Hoyle]

Scott Lehman wrote:
> Andreas,
> 
> Andreas' point about storing diffs in SCM archives is correct.  There
> are several SCM tools that do not store revisions as diffs but store
> entire files.  Dimensions being one.  On demand diffing between
> revisions and merging are orthogonal to how revisions are natively
> stored in the SCM repository.
>
An SCM must deal primarily in diffs though, and that's the point... not 
the implementation details.

OTOH most SCM's don't have the branch/merge capability that CVS has 
(hence the whole reserved/locking paradigm that still sticks around so 
much - they can't merge so you have to stop other people working on the 
files).

Tony