/[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.49.2.10 by kaz, Tue Mar 4 05:51:26 2003 UTC revision 1.49.2.11 by kaz, Sun Apr 13 06:22:43 2003 UTC
# Line 312  for duplicate entries" Line 312  for duplicate entries"
312            (terpri file)))            (terpri file)))
313        (error (cond) (error "unable to write mapping file: ~a" cond)))))        (error (cond) (error "unable to write mapping file: ~a" cond)))))
314    
315  (defun mapping-synchronize (&optional filemap)  (defun mapping-synchronize (&key filemap (direction :either))
316  "Synchronizes the contents of files in the sandbox, and their corresponding  "Synchronizes the contents of files in the sandbox, and their corresponding
317  CVS files in the Meta-CVS directory. This must be done before any CVS operation  CVS files in the Meta-CVS directory. This must be done before any CVS operation
318  such as commit or update, so that the Meta-CVS files have the correct contents  such as commit or update, so that the Meta-CVS files have the correct contents
# Line 326  to ensure that the newly incorporated ch Line 326  to ensure that the newly incorporated ch
326              (case kind              (case kind
327                ((:file)                ((:file)
328                   (let ((left id) (right (abstract-to-real-path path)))                   (let ((left id) (right (abstract-to-real-path path)))
329                     (case (synchronize-files left right executable)                     (case (synchronize-files left right executable
330                                                :direction direction)
331                       ((:left)                       ((:left)
332                         (chatter-info "sync ~a -> ~a~%" left right))                         (chatter-info "sync ~a -> ~a~%" left right))
333                       ((:right)                       ((:right)
334                         (chatter-info "sync ~a <- ~a~%" left right))                         (chatter-info "sync ~a <- ~a~%" left right))
335                       ((:same))                       ((:same :no-sync))
336                       ((:dir)                       ((:dir)
337                         (error "cannot sync, either ~a or ~a is a directory."                         (error "cannot sync, either ~a or ~a is a directory."
338                                left right))                                left right))
# Line 477  whether they came from the CVS repositor Line 478  whether they came from the CVS repositor
478                                              (unlink real-new)))                                              (unlink real-new)))
479                        (case kind                        (case kind
480                          ((:file)                          ((:file)
481                             (synchronize-files new-id real-new executable))                             (synchronize-files new-id real-new executable
482                                                  :direction :right))
483                          ((:symlink)                          ((:symlink)
484                             (honor-dry-run (target real-new)                             (honor-dry-run (target real-new)
485                               (ensure-directories-exist real-new)                               (ensure-directories-exist real-new)
# Line 494  whether they came from the CVS repositor Line 496  whether they came from the CVS repositor
496                    (case kind                    (case kind
497                      ((:file)                      ((:file)
498                         (chatter-terse "adding ~a~%" real)                         (chatter-terse "adding ~a~%" real)
499                         (synchronize-files id real executable))                         (synchronize-files id real executable
500                                              :direction :right))
501                      ((:symlink)                      ((:symlink)
502                         (chatter-terse "linking ~a -> ~a~%" real target)                         (chatter-terse "linking ~a -> ~a~%" real target)
503                         (honor-dry-run (real)                         (honor-dry-run (real)
# Line 515  whether they came from the CVS repositor Line 518  whether they came from the CVS repositor
518                (chatter-terse "restoring ~a~%" real)                (chatter-terse "restoring ~a~%" real)
519                (case kind                (case kind
520                  ((:file)                  ((:file)
521                     (synchronize-files id real executable))                     (synchronize-files id real executable :direction :right))
522                  ((:symlink)                  ((:symlink)
523                     (honor-dry-run (real)                     (honor-dry-run (real)
524                       (ensure-directories-exist real)                       (ensure-directories-exist real)

Legend:
Removed from v.1.49.2.10  
changed lines
  Added in v.1.49.2.11

  ViewVC Help
Powered by ViewVC 1.1.5