/[meta-cvs]/meta-cvs/F-26D2A2DCE1CF180F943606C59DC63A51.lisp
ViewVC logotype

Diff of /meta-cvs/F-26D2A2DCE1CF180F943606C59DC63A51.lisp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.21 by kaz, Sat Oct 5 18:09:48 2002 UTC revision 1.21.2.1 by kaz, Sat Oct 26 21:09:27 2002 UTC
# Line 374  Options: Line 374  Options:
374    
375  Semantics:  Semantics:
376    
377    The grab command intelligently synchronizes a code stream in the repository    The grab command is a tool for incorporating external code streams
378    to an external directory tree.  This means that, after the grab, the    into a Meta-CVS module.
   specified branch or the main trunk will look exactly like that directory  
   tree.  The external directory which is grabbed is the current directory,  
   and its subdirectories.  
   
   If the subdirectory-path is specified, then grab will synchronize to the  
   specified subdirectory of the module, rather than to the entire module.  
   This is useful for incorporating updates of third party source code  
   representing individual components of your module.  
379    
380    The checkout command takes an optional subdirectory-path as well,    Grab works by comparing the contents of the current directory and its
381    allowing you to treat a subtree of a module as a module.    subdirectories, to the tip of the trunk or a branch of an existing
382      Meta-CVS module. It produces a sandbox which contains a minimized set
383      of local edits that are needed to make the branch or trunk in the repository
384      look exactly like the current directory.
385    
386      These local edits have to be committed just like hand-made edits; the grab
387      command itself has no effect on the contents of the repository, and does
388      not change the local directory in any way other than by creating the MCVS
389      subdirectory.
390    
391      If it was run with the wrong arguments, the recovery procedure is simply
392      to recursively remove the MCVS subdirectory. Then it's possible to run grab
393      again with different arguments, as necessary.
394    
395      If the subdirectory-path is specified, then grab will operate on
396      just that subdirectory of the module, making just that subtree look
397      like the current directory. The result will be a partial sandbox
398      containing local edits to just the visible part of the module.
399      (See the help for the checkout command, which also takes a subdirectory path
400      parameter to create a partial sandbox).
401    
402    Either the -r option or the -A option must be specified. This forces    Either the -A option or the -r option must be specified. This forces
403    users to be explicitly clear about where they want the grab to go;    users to be explicitly clear about where they want the grab to go;
404    the main trunk or a branch. The last thing you want is someone accidentally    the main trunk or a branch.
   grabbing something to the main trunk and then committing.  
405    
406    Grab is safe: it works by converting the current directory to a working copy    Grab performs no merging whatsoever. It's job is to place a new document
407    of the module, which contains a minimized set of local changes which, when    baseline at the tip of a code stream. Third party source tracking is
408    committed, will make the target branch look like the current directory.  Your    performed by grabbing snapshots to a branch, and then merging that branch
409    files are left untouched, and the repository is untouched.  You can now edit    in the usual way. ")
   files, rename, view differences and so forth. If you are satisfied with the  
   result of the grab, then commit.  To throw away the grab, simply remove the  
   MCVS subdirectory.  You can then re-run grab with different arguments.")  

Legend:
Removed from v.1.21  
changed lines
  Added in v.1.21.2.1

  ViewVC Help
Powered by ViewVC 1.1.5