[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: CVS Update Behaviour

From: Greg A. Woods
Subject: Re: CVS Update Behaviour
Date: Fri, 22 Feb 2002 16:17:27 -0500 (EST)

[ On , February 22, 2002 at 11:09:21 (-0500), Arcin Bozkurt - Archie wrote: ]
> Subject: Re: CVS Update Behaviour
> A question on merge behaviour of cvs: Will CVS be able to follow a file
> disappearing in one module, appearing in another one? I would say no.
> And therefore a merge would not be able to propogate bugfixes on that
> file even though the file is not deleted, and resurrected for another,
> etc.

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.

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

Why this is even an FAQ, is it not?

And besides if you do your merges like a real programmer who uses the
right tool for the job instead of one so caught up in using just one
tool for everything then you'll be asked very nicely by the "patch"
program (or emacs ediff, or your own choice of a nifty fancy GUI merge
tool) which file it should apply the changes to, and provided you've
prepared properly as any real programmer will have done then you'll know
ahead of time what name to type, but even if you manage to loose your
notepad and forget the name you'll still be left with a nice little
"oldname.c.rej" file that you can re-apply either manually or with
another "patch" invocation.

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!!!!

Come on guys!  Get a life!  This is not a "problem"!  Deal with it and
go on to real issues within your own projects!

                                                                Greg A. Woods

+1 416 218-0098;  <address@hidden>;  <address@hidden>;  <address@hidden>
Planix, Inc. <address@hidden>; VE3TCP; Secrets of the Weird <address@hidden>

reply via email to

[Prev in Thread] Current Thread [Next in Thread]