/[meta-cvs]/meta-cvs/F-FFF16CA4956A36F19290AC9E1EBAFFD8
ViewVC logotype

Diff of /meta-cvs/F-FFF16CA4956A36F19290AC9E1EBAFFD8

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

revision 1.60 by kaz, Sun Apr 13 14:39:13 2003 UTC revision 1.61 by kaz, Tue Apr 22 06:28:16 2003 UTC
# Line 402  whether they came from the CVS repositor Line 402  whether they came from the CVS repositor
402                  (restart-case                  (restart-case
403                    (honor-dry-run (real)                    (honor-dry-run (real)
404                      (ensure-directories-gone real))                      (ensure-directories-gone real))
405                    (ignore () :report "Ignore file removal error."))                    (continue () :report "Ignore file removal error."))
406                  (push item rollback-restore-items)))))                  (push item rollback-restore-items)))))
407    
408          (dolist (pair moved-pairs)          (dolist (pair moved-pairs)
# Line 445  whether they came from the CVS repositor Line 445  whether they came from the CVS repositor
445            (when (or clobber-add-items clobber-move-pairs)            (when (or clobber-add-items clobber-move-pairs)
446              (super-restart-case              (super-restart-case
447                (error "some moves or adds want to overwrite local files or directories.")                (error "some moves or adds want to overwrite local files or directories.")
448                (print-clobbers ()                (info ()
449                  :report "Print list of adds or moves which want to overwrite."                  :report "Print list of adds or moves which want to overwrite."
450                  (dolist (item clobber-add-items)                  (dolist (item clobber-add-items)
451                    (format t "add: ~a~%"                    (format t "add: ~a~%"
# Line 456  whether they came from the CVS repositor Line 456  whether they came from the CVS repositor
456                                                     (first pair)))                                                     (first pair)))
457                            (abstract-to-real-path (mapping-entry-path                            (abstract-to-real-path (mapping-entry-path
458                                                     (second pair))))))                                                     (second pair))))))
459                (do-clobber ()                (continue ()
460                  :report "Go ahead and overwrite the target files."                  :report "Go ahead and overwrite the target files."
461                  (unwind)))))                  (unwind)))))
462    
# Line 511  whether they came from the CVS repositor Line 511  whether they came from the CVS repositor
511                           (ensure-directories-exist real)                           (ensure-directories-exist real)
512                           (symlink target real))))                           (symlink target real))))
513                    (push item rollback-remove-items)))))))                    (push item rollback-remove-items)))))))
514        (continue ()        (bail ()
515          :report "Restore all restructuring done so far."          :report "Restore all restructuring done so far."
516          (chatter-debug "Restoring.~%")          (chatter-debug "Restoring.~%")
517          (dolist (item rollback-remove-items)          (dolist (item rollback-remove-items)

Legend:
Removed from v.1.60  
changed lines
  Added in v.1.61

  ViewVC Help
Powered by ViewVC 1.1.5