/[meta-cvs]/meta-cvs/F-73871F8E513E48E095DE0FEFB1CFC48B
ViewVC logotype

Diff of /meta-cvs/F-73871F8E513E48E095DE0FEFB1CFC48B

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

revision 1.29 by kaz, Thu Oct 10 05:56:15 2002 UTC revision 1.29.2.4 by kaz, Tue Apr 22 05:53:42 2003 UTC
# Line 69  Line 69 
69        (setf new-types (set-difference        (setf new-types (set-difference
70                          new-types types :key #'first :test #'string=))                          new-types types :key #'first :test #'string=))
71    
72        (unwind-protect        (let ((*dry-run-option* nil))
73          (setf new-types (types-let-user-edit new-types *mcvs-new-types*))          (unwind-protect
74          (ignore-errors (unlink *mcvs-new-types*)))            (setf new-types (types-let-user-edit new-types *mcvs-new-types*))
75              (ignore-errors (unlink *mcvs-new-types*))))
76    
77        (setf new-map-entries (types-remove-ignores new-types new-map-entries))        (setf new-map-entries (types-remove-ignores new-types new-map-entries))
78        (setf new-map-entries (types-remove-ignores types new-map-entries))        (setf new-map-entries (types-remove-ignores types new-map-entries))
# Line 90  Line 91 
91          (when (setf types (append types new-types))          (when (setf types (append types new-types))
92            (types-write types *mcvs-types*))            (types-write types *mcvs-types*))
93    
         (chatter-debug "Synchronizing.~%")  
         (mapping-synchronize)  
   
94          (setf new-map-entries (mapping-extract-kind new-map-entries :file))          (setf new-map-entries (mapping-extract-kind new-map-entries :file))
95    
96          (let ((add-commands (types-make-cvs-adds types new-map-entries)))          (let ((add-commands (types-make-cvs-adds types new-map-entries)))
# Line 106  Line 104 
104                                                  "add" ,@(format-opt add-options)                                                  "add" ,@(format-opt add-options)
105                                                  ,@add-args)))                                                  ,@add-args)))
106                      (error "CVS add failed.")))                      (error "CVS add failed.")))
107                  (when (and types (not types-exists))                  (when (and types (not types-exists) (not *dry-run-option*))
108                    (when (not (execute-program `("cvs" ,@(format-opt cvs-options)                    (when (not (execute-program `("cvs" ,@(format-opt cvs-options)
109                                                  "add" ,*mcvs-types-name*)))                                                  "add" ,*mcvs-types-name*)))
110                      (error "CVS add failed.")))                      (error "CVS add failed.")))
111                  (return))                  (return))
112                (retry ()                (retry ()
113                  :report "Try invoking CVS again.")                  :report "Try invoking CVS again.")
114                (continue ()                (bail ()
115                  :report "Undo everything; restore the mapping."                  :report "Undo everything; restore the mapping."
116                  (chatter-debug "Restoring map.~%")                  (chatter-debug "Restoring map.~%")
117                  (mapping-write saved-filemap *mcvs-map*)                  (mapping-write saved-filemap *mcvs-map*)
# Line 139  Line 137 
137    
138  Options:  Options:
139    
140    -R                Recursive behavior: recursively add the contents    -R                Recursive behavior: recursively add the contents
141                      of all objects that are directories. By default,                      of all objects that are directories. By default,
142                      trying to add a directory signals a continuable error.                      trying to add a directory signals a continuable error.
143    -m \"text ...\"     Use the specified text for the creation message.    -m \"text ...\"     Use the specified text for the creation message.
144    -k key-expansion  Add the file with the specified RCS expansion mode.    -k key-expansion  Add the file with the specified RCS expansion mode.
145    

Legend:
Removed from v.1.29  
changed lines
  Added in v.1.29.2.4

  ViewVC Help
Powered by ViewVC 1.1.5