project, methods, protocol

[Chad Berkley]

Peter,

I added your changes to CVS under the branch
EML_PROSPECTIVE_CHANGES_082602.  To get this branch, change into your
eml directory (that you have checked out from cvs) and issue the
command:
cvs update -r EML_PROSPECTIVE_CHANGES_082602
your working directory should now be using the branched files and any
files you commit will be commited to the branch only.  to get your
working directory back to the root, issue the command:
cvs update -A

the -r switch updates to a specified revision, in this case the tag. 
once you do this, you should see that the versions of the files now have
an extra two periods in them.  i.e. instead of 1.1, the revision number
would be 1.1.2.1.  The last part of the revision number is the revision
within the branch.  if you changed the file with id 1.1.2.1 and commited
it, the revision would change to 1.1.2.2.  When you move your working
directory back into the root of the tree (using the -A switch), the
revision number should go back to 1.1.  


to create a branch, you issue the following commands after changing into
the eml directory:
cvs tag -b SOME_MEANINGFUL_ID
cvs update -r SOME_MEANINGFUL_ID

the cvs tag command creates the branch.  the update command makes your
working directory work within the branch.  You have to do both.

just so you know, you can view all of the branches and other tags by
doing a cvs log on any file in the directory.  at the top of the log, it
will show the current tags and branches associated with that file.

chad

On Fri, 2002-08-23 at 14:31, Peter McCartney wrote:
> Tim et. al.
> 
> I cant figure out how to do the branch thing within cvs so im just doing
> this through email. If you thinke this is no the right track, then ill make
> a full version that works with all the schemas and get help to figure out
> the branch submission.
> 
> As a trial balloon for the project/protocol bug, Ive made changes to
> eml-project and eml-protocol, and ive created a new file called eml-method.
> 
> to summarize
> 
> eml-project loses sampling, but gains a recursive link to itself.
> 
> eml-method is a new module that is meant to be imported into dataset,
> entitybase and attribute. It contains elements for sampling, qualityControl
> (that is actions you took during data collection to control quality), and
> methodsteps. each methodstep contains a description (which may  be any
> combination of a text description, pointer to a citation, or pointer to a
> protocol), instrumentation, source data, software.
> 
> eml-protocol is simplied to just a text description, with optional elements
> for sofware, instrumentation or qualitycontrol (but not datasets, because we
> cant really say a generic method requires a specific dataset). eml-protocol
> is linked only in eml-method - existing links to 
> 
> Peter McCartney (peter.mccartney at asu.edu)
> Center for Environmental Studies
> Arizona State University
> 480-965-6791 
> 
> 
-- 
-----------------------
Chad Berkley
National Center for 
Ecological Analysis 
and Synthesis (NCEAS)
berkley at nceas.ucsb.edu
-----------------------