Re: CVS

[Jesper S. <js...@re...>]

>>>>> "Ken" == Ken Tyler <ke...@we...> writes:

Ken> Hi,

Ken> I'm still on the bottom of the learning curve regarding all the
Ken> CVS magic.

Ken> I'd like to ask how other people manage their own tree, how do
Ken> you stay in sync with the repositry *AND* still keep local work
Ken> from being lost - like my life time job on 53c7xx.c and related
Ken> files ?

cvs update


Just regular cvs update. It will not cause local work to be
lost. Worst case it will try to merge your work with stuff from the
repository if the work affect the same lines of a file - but then it
will notify you of a conflict (C) and leave both versions in the file
marked by <<<<<<<<<<<< and >>>>>>>>>>>>>.

Still, it's a good idea to do occasional diffs (cvs diff -u) and keep
them around (backups).

Jesper