Re: Update without merge.

[david]

> Hello,
> 
> I would like to be able to update my project without CVS merging anything.  
It should replace unedited files with newer ones if they exist.  But files 
which have been edited (by me but not checked in) should be left alone.  I 
often need to hack up a bunch of files in order to run some test.  It would 
be nice to not have to make all these changes again every time I do an 
update.  Is this possible?  Thanks.
> 
I'm not really understanding here.  Why would you want to do that?
If you've hacked up file 1, and another developer changes file 1 and
file 2, if you only update file 2 you might well have inconsistent
versions that won't even compile.

On the other hand, if you update file 1 also, CVS will do its best
to merge the repository changes with your hacks.  Either it will
succeed, in which case you want those changes, or it will find
conflicts, in which case you really do need to pay attention to
what's changed in the repository.

In any case, it looks ot me that the right answer is exactly what
CVS does:  update all files, and merge changes as best it can.
If CVS finds conflicts on the merge, then you need to look at
the changes yourself.  CVS does not simply overwrite source
files; look at the files in the directory with names beginning
with ".#".  You can always therefore get the old versions back,
either to overwrite the merged versions or just for reference.

-- 
Now building a CVS reference site at http://www.thornleyware.com
address@hidden