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

Diff of /meta-cvs/F-BE2DE9340254D8E8E6E2649A55D3A742

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

revision 1.4 by kaz, Fri Feb 8 06:51:45 2002 UTC revision 1.5 by kaz, Wed May 15 13:52:41 2002 UTC
# Line 35  happens, and NIL is returned. If either Line 35  happens, and NIL is returned. If either
35          (unlink left-file)          (unlink left-file)
36          (link right-file left-file)          (link right-file left-file)
37          :right)          :right)
38        (t        ((older-p right left)
39          (unlink right-file)          (unlink right-file)
40          (link left-file right-file)          (link left-file right-file)
41          :left))))          :left)
42          (t
43            (restart-case
44              (error "~a and ~a have the same modification time."
45                     left-file right-file)
46              (:choose-left () :report (lambda (s)
47                                         (format s "take ~a; clobber ~a."
48                                                 left-file right-file))
49                (unlink right-file)
50                (link left-file right-file)
51                :left)
52              (:choose-right () :report (lambda (s)
53                                          (format s "take ~a; clobber ~a."
54                                                  right-file left-file))
55                (unlink left-file)
56                (link right-file left-file)
57                :right))))))

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5

  ViewVC Help
Powered by ViewVC 1.1.5