Most development in CVS is done on the Controls Network. Make sure you select your profile at login.
Instructions for Updating MATLAB 2012 Files
Make edits to your file, then commit and move the file to production:
[fphysics@facet-srv01 ~/dstorey/cvswork/matlab/toolbox ]$ cvs commit -m "First version of the Diff Pumping watcher script" DPSvacWatcher.m dstorey@mcclogin's password: RCS file: /afs/slac/g/lcls/cvs/matlab/toolbox/DPSvacWatcher.m,v done Checking in DPSvacWatcher.m; /afs/slac/g/lcls/cvs/matlab/toolbox/DPSvacWatcher.m,v <-- DPSvacWatcher.m initial revision: 1.1 done [fphysics@facet-srv01 ~/dstorey/cvswork/matlab/toolbox ]$ cvs2prod DPSvacWatcher.m dstorey@mcclogin's password: U DPSvacWatcher.m
Instructions for Updating EDM Files
First Pass
Most of the time, we are checking out a package or folder, for example some EDM displays. First, make working directory (mine is called 'blah'). Then:
[fphysics@facet-srv01 ~/sgess/blah ]$ cvs co tools/edm/display/facet sgess@mcclogin's password: cvs checkout: Updating tools/edm/display/facet U tools/edm/display/facet/all_all_main.edl U tools/edm/display/facet/all_all_main_help.edl U tools/edm/display/facet/all_eplus_main.edl U tools/edm/display/facet/all_eplus_main_help.edl U tools/edm/display/facet/all_in10_all.edl ...
Next, make an edit and commit the changes:
[fphysics@facet-srv01 ~/sgess/blah/tools/edm/display/facet ]$ cvs commit -m "add a rectangle" IPProfs2.edl sgess@mcclogin's password: Checking in IPProfs2.edl; /afs/slac/g/lcls/cvs/tools/edm/display/facet/IPProfs2.edl,v <-- IPProfs2.edl new revision: 1.5; previous revision: 1.4 done
Finally, 'cd' to production directory and pull changes:
[fphysics@facet-srv01 ~/sgess/blah/tools/edm/display/facet ]$ cd $TOOLS/edm/display/facet [fphysics@facet-srv01 /usr/local/facet/tools/edm/display/facet ]$ cvs update IPProfs2.edl sgess@mcclogin's password: P IPProfs2.edl
Typical workflow
Always check that your files are up-to-date before making and committing changes. Do this by passing the '-A' argument to 'cvs update':
[fphysics@facet-srv01 ~/sgess/blah/tools/edm/display/facet ]$ cvs update -A IPProfs2.edl sgess@mcclogin's password: [fphysics@facet-srv01 ~/sgess/blah/tools/edm/display/facet ]$
There is no output which means my repo is current.
I have a second version of the repo checked out which doesn't have the new changes:
[fphysics@facet-srv01 ~/sgess/test/tools/edm/display/facet ]$ cvs update -A IPProfs2.edl sgess@mcclogin's password: P IPProfs2.edl
The 'P' means I need to pull the changes. After that, resume "normal" flow:
[fphysics@facet-srv01 ~/sgess/blah/tools/edm/display/facet ]$ cvs commit -m "add a rectangle" IPProfs2.edl sgess@mcclogin's password: Checking in IPProfs2.edl; /afs/slac/g/lcls/cvs/tools/edm/display/facet/IPProfs2.edl,v <-- IPProfs2.edl new revision: 1.5; previous revision: 1.4 done
'cd' to production directory and pull changes:
[fphysics@facet-srv01 ~/sgess/blah/tools/edm/display/facet ]$ cd $TOOLS/edm/display/facet [fphysics@facet-srv01 /usr/local/facet/tools/edm/display/facet ]$ cvs update IPProfs2.edl sgess@mcclogin's password: P IPProfs2.edl