Re: CVS usage policy (was Re: [Fwd: CVS change DONE])

[Edwin Goei <ed...@sun.com>]

Arnaud Le Hors wrote:
> 
> We need to be more serious about the way we manage our CVS repository.
> Having people changing one branch or another and merging pieces here and
> there when they feel like it is just plain wrong. CVS is crappy enough*
> that it doesn't remember any merge you've done. When you merge from one
> branch to another, it always considers the root of the branch to be the
> base of the merge. But if you've already merged since then it is not.
> Taking the root of the branch as the base, CVS then tries to apply all
> changes any way and most likely ends up with conflicts all over the
> place.
> 
> The bottom line is that we need to know in what state the branch exactly
> is, which can be done with tags. A long time ago I sent out a message
> explaining how to make a merge of the whole tree from one branch to
> another. But being the only one to stick to that plan it doesn't work.

I think there are a couple issues that prevent this from happening: 1)
all committers must do this and 2) the plan is too complex.  Hence, the
current outcome.

-Edwin

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-j-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-j-dev-help@xml.apache.org