Subject: Precaution before committing to CVS
Date: Thu, 17 Dec 1998 13:04:20 -0800 (PST)
From: Terry Hung <terryh@SLAC.Stanford.EDU>
To: Distribution BBR_CMMNTY <bfmail@SLAC.Stanford.EDU>

Distribution: BBR_CMMNTY

Dear BaBar Collaborators:

    Committing changes to CVS without first comparing files with HEAD
in CVS is quite dangerous. One may accidentally wipe out changes
committed by others. The following procedure is recommended before you
commit changes to CVS:

    1) Type one of the following commands

       cvs diff -Dnow <file>    [compare one file with HEAD in CVS]
       or
       cvs diff -Dnow           [compare whole package]

    to compare local version with the HEAD. Carefully look for changes
that do not belong to you. If there is none, proceed with the commit.

    If there is differences that do not belong to you, consider the
following options:

    2) If there is concurrent changes in CVS committed by another user.
Type:

        cvs update -dA          [merge with HEAD version]

        now go back to step 1) until only your changes remain in diff.

    3) If your version is actually a copy from a previous version. Type:

        mv {file} {file}.old    [save your version]
        cvs update -dA {file}   [get a fresh copy]
        emacs {file}            [put your changes back]

       to redo the editing. BaBar do not allow copying CVS files from
one directory to another. If you have to do so for special reasons,
following the procedure above can prevent mistakes.

    Note: Do not commit a copy back if you see any changes that do not
belong to you. When in doubt, always check out a fresh copy and
starting over the editing session.

    For more information, see web page:

http://www.slac.stanford.edu/BFROOT/doc/cvs/cvs-babar-basic.html
or
Computing -> Tools -> CVS -> Basic CVS commands

   Thanks for your cooperation!

--
Terry Hung - Stanford Linear Accelerator Center
phone: 650-926-3618
e-mail: terryh@slac.stanford.edu

To:Distribution   BBR_CMMNTY