Re: cvs add <directory>

[Kaz Kylheku]

On Tue, 27 May 2003, Greg A. Woods wrote:

> [ On Tuesday, May 27, 2003 at 09:29:13 (-0700), Paul Sander wrote: ]
> > As for the "rarity" of having to review the history of any given file,
> > that's just bogus.  My users review the history every time they perform
> > a merge.
> 
> Perhaps your users are forced to merge too often because they're working
> in a poorly engineered project.

In my Meta-CVS project repository, I have a stable branch and the trunk
(with some things named differently). I merge to the trunk after every
single commit to the stable branch.

I just switch to another sandbox which is updated to the trunk, type
``mcvs merge mcvs-1-0-branch'', resolve any conflicts and commit.

You want to merge early and often, in the spirit of continuous
integration.

The only reason for not doing so is the psychological barrier created
by an awkward manual system.