Re: CVS Update Behaviour

[Noel Yap]

--- "Greg A. Woods" <address@hidden> wrote:
> [ On , February 22, 2002 at 11:09:21 (-0500), Arcin
> Bozkurt - Archie wrote: ]
> Of course a merge won't work across renames.  Who
> cares?  How often has
> this happened to you?  The wording of your question
> suggests:  NEVER.

Well, if I were using a VC tool that didn't support
renames, I would do everything I could to avoid them,
thereby minimizing such a situation.

However, when using CC, this did happen quite often.

> Don't do renames between branches that you need to
> merge between!!!!!

This is another one of those "CVS is perfect for what
it does.  It's not broken.  And don't pay any
attention to those other tools behind the curtain!"
stances.  It doesn't hold water.

I think the only argument you've made that does hold
water is, "Then fix it."

> The ability to do merges with CVS itself is a
> quick-and-dirty first cut
> to moving changes around.  It's not supposed to work
> 100% every time!
> It never was!  All merges _MUST_ be manually
> verified every time!!!!

Yeah, so what?  The point is that the tool _supports_
merges.  It clearly doesn't when it comes to renames.
(I consider patch and emacs to be outside of the
tool).

Noel

__________________________________________________
Do You Yahoo!?
Yahoo! Sports - Coverage of the 2002 Olympic Games
http://sports.yahoo.com