/[meta-cvs]/meta-cvs/F-233AD6EEE14894A7303F09519A2AB734
ViewVC logotype

Diff of /meta-cvs/F-233AD6EEE14894A7303F09519A2AB734

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

revision 1.40 by kaz, Wed Apr 3 00:57:57 2002 UTC revision 1.41 by kaz, Thu Apr 4 16:55:09 2002 UTC
# Line 58  Line 58 
58  (defconstant *branch-options* '(() ()))  (defconstant *branch-options* '(() ()))
59  (defconstant *merge-options* '(() ()))  (defconstant *merge-options* '(() ()))
60  (defconstant *remerge-options* '(() ()))  (defconstant *remerge-options* '(() ()))
61    (defconstant *list-branches-options* '(() ()))
62    
63  (defconstant *mcvs-command-table*  (defconstant *mcvs-command-table*
64   `(("import" ,#'mcvs-import-wrapper ,@*import-options*)   `(("import" ,#'mcvs-import-wrapper ,@*import-options*)
# Line 83  Line 84 
84     ("convert" ,#'mcvs-convert-wrapper ,@*convert-options*)     ("convert" ,#'mcvs-convert-wrapper ,@*convert-options*)
85     ("branch" ,#'mcvs-branch-wrapper ,@*branch-options*)     ("branch" ,#'mcvs-branch-wrapper ,@*branch-options*)
86     ("merge" ,#'mcvs-merge-wrapper ,@*merge-options*)     ("merge" ,#'mcvs-merge-wrapper ,@*merge-options*)
87     ("remerge" ,#'mcvs-remerge-wrapper ,@*remerge-options*)))     ("remerge" ,#'mcvs-remerge-wrapper ,@*remerge-options*)
88       ("list-branches" ,#'mcvs-list-branches-wrapper ,@*list-branches-options*)
89       ("lb" ,#'mcvs-list-branches-wrapper ,@*list-branches-options*)))
90    
91  (defconstant *usage*  (defconstant *usage*
92  "Meta-CVS command syntax:  "Meta-CVS command syntax:
# Line 149  Commands: Line 152  Commands:
152    remerge            Re-apply the most recent merge without changing any tags.    remerge            Re-apply the most recent merge without changing any tags.
153                       Useful when a merge goes bad so the local changes have                       Useful when a merge goes bad so the local changes have
154                       to be discarded and the merge done over again.                       to be discarded and the merge done over again.
155      list-branches (lb) List Meta-CVS managed branches.
156    convert            Convert a CVS module to a Meta-CVS project. This requires    convert            Convert a CVS module to a Meta-CVS project. This requires
157                       filesystem-level access to the repository. This is                       filesystem-level access to the repository. This is
158                       currently an experimental command that is known not                       currently an experimental command that is known not

Legend:
Removed from v.1.40  
changed lines
  Added in v.1.41

  ViewVC Help
Powered by ViewVC 1.1.5