/[meta-cvs]/meta-cvs/F-993DC8DDEC493F0D641AC0C23DB6BAB0
ViewVC logotype

Diff of /meta-cvs/F-993DC8DDEC493F0D641AC0C23DB6BAB0

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

revision 1.29 by kaz, Tue Nov 28 04:12:08 2006 UTC revision 1.30 by kaz, Tue Nov 28 07:47:22 2006 UTC
# Line 9  Line 9 
9      (return-from rm (values)))      (return-from rm (values)))
10    
11    (in-sandbox-root-dir    (in-sandbox-root-dir
12      (let (files-to-remove (filemap (mapping-read *mcvs-map*)))      (let (files-to-remove (filemap (mapping-read *map-path*)))
13    
14        (chatter-debug "Unmapping.~%")        (chatter-debug "Unmapping.~%")
15        (dolist (file files)        (dolist (file files)
# Line 19  Line 19 
19                                (real-to-abstract-path full-name)))                                (real-to-abstract-path full-name)))
20                   (entries (mapping-prefix-matches filemap abs-name)))                   (entries (mapping-prefix-matches filemap abs-name)))
21              (cond              (cond
22                ((path-prefix-equal *mcvs-dir* full-name)                ((path-prefix-equal *admin-dir* full-name)
23                   (error "cannot remove ~a: path is in a reserved Meta-CVS area."                   (error "cannot remove ~a: path is in a reserved Meta-CVS area."
24                          full-name))                          full-name))
25                ((and (second entries) (not recursivep))                ((and (second entries) (not recursivep))
# Line 41  Line 41 
41            (mapping-synchronize :direction :left))            (mapping-synchronize :direction :left))
42          (let ((new-filemap (set-difference filemap files-to-remove          (let ((new-filemap (set-difference filemap files-to-remove
43                                             :test #'mapping-same-id-p)))                                             :test #'mapping-same-id-p)))
44            (mapping-write new-filemap *mcvs-map* :sort-map t))            (mapping-write new-filemap *map-path* :sort-map t))
45    
46          (chatter-debug "Updating file structure.~%")          (chatter-debug "Updating file structure.~%")
47          (mapping-update :no-delete-removed no-sync))))          (mapping-update :no-delete-removed no-sync))))

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

  ViewVC Help
Powered by ViewVC 1.1.5