EPICS: CVS usage examples: Difference between revisions

From CLONWiki
Jump to navigation Jump to search
Nerses (talk | contribs)
No edit summary
 
Nerses (talk | contribs)
No edit summary
 
Line 1: Line 1:
=Checking out sources=
=Checking out sources=
We will create temporary directory '''t1''' and will check out '''CAEN_HV''' and '''bigsub''' sources into it.
   mkdir t1
   mkdir t1
   cd t1
   cd t1
   cvs co baseB/src/CAEN_HV baseB/src/bigsub (checkout CAEN_HV and bigsub sources)
   cvs co baseB/src/CAEN_HV baseB/src/bigsub


=Tagging a new branch=
=Tagging a new branch=
We will tag them with new branch name R3-14-8-2 ( ''.:;'' symbols are not allowed in the tag names).
  cd baseB/src
   cvs tag -b R3-14-8-2 (create tag)
   cvs tag -b R3-14-8-2 (create tag)
   cvs up -r R3-14-8-2 (update to tagged version)
   cvs up -r R3-14-8-2 (update to tagged version)
  cd baseB/src


=Adding new files=
=Adding new files=
Line 23: Line 25:
=Commiting changes=
=Commiting changes=


   cvs ci -m "This is bigsub record version for CAEN HV, it is not compatiable with standard bigsub record."  
   cvs ci -m "This is bigsub record version for CAEN HV, it is not compatiable with standard bigsub record."
 
=Check out the branch=
 
  cvs co -r R3-14-8-2
 
=Update the branch=
 
  cvs up -r R3-14-8-2
 
=Merge branch with main trunk=


  For example:
Use -j option to update, which stands for ''join''.
    cvs update -A
  cvs co baseB/src/bigsub
    touch a b c
  cvs up -jR3-14-8-2
    cvs add a b c ; cvs ci -m "added" a b c
    cvs tag -b branchtag
    cvs update -r branchtag
    touch d ; cvs add d
    rm a ; cvs rm a
    cvs ci -m "added d, removed a"
    cvs update -A
    cvs update -jbranchtag

Latest revision as of 21:05, 8 January 2007

Checking out sources

We will create temporary directory t1 and will check out CAEN_HV and bigsub sources into it.

 mkdir t1
 cd t1
 cvs co baseB/src/CAEN_HV baseB/src/bigsub

Tagging a new branch

We will tag them with new branch name R3-14-8-2 ( .:; symbols are not allowed in the tag names).

 cd baseB/src
 cvs tag -b R3-14-8-2 (create tag)
 cvs up -r R3-14-8-2 (update to tagged version)

Adding new files

Add, modify or replace your files in the corresponding directories. To find out which files should be added into cvs:

 clonpc3:bigsub> find -type f -maxdepth 1 -exec cvs st {} \; |grep Unknown
 File: a_out.h           Status: Unknown

This command finds the regular files in current directory and for each file found does cvs status and greps for Unknown status. Then we need add files into cvs

 cvs add a_out.h


Commiting changes

 cvs ci -m "This is bigsub record version for CAEN HV, it is not compatiable with standard bigsub record."

Check out the branch

 cvs co -r R3-14-8-2

Update the branch

 cvs up -r R3-14-8-2

Merge branch with main trunk

Use -j option to update, which stands for join.

 cvs co baseB/src/bigsub
 cvs up -jR3-14-8-2