/[meta-cvs]/meta-cvs/F-58F396B2ADF675136DD8552C6FFD5310.lisp
ViewVC logotype

Diff of /meta-cvs/F-58F396B2ADF675136DD8552C6FFD5310.lisp

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

revision 1.1 by kaz, Tue Apr 2 23:38:20 2002 UTC revision 1.2 by kaz, Tue Apr 2 23:45:46 2002 UTC
# Line 44  and one of branch tags." Line 44  and one of branch tags."
44  (defun mcvs-branch (global-options branch-name)  (defun mcvs-branch (global-options branch-name)
45    (branch-tag-check branch-name)    (branch-tag-check branch-name)
46    (in-sandbox-root-dir    (in-sandbox-root-dir
47      (let ((branchpoint-tag (format nil "~a~aP" branch-name *branch-char*)))      (let ((branchpoint-tag (format nil "~a~abranch-point"
48                                       branch-name *branch-char*)))
49        (chdir *mcvs-dir*)        (chdir *mcvs-dir*)
50        (chatter-debug "Invoking CVS.~%")        (chatter-debug "Invoking CVS.~%")
51        (execute-program `("cvs" ,@(format-opt global-options)        (execute-program `("cvs" ,@(format-opt global-options)
# Line 71  and one of branch tags." Line 72  and one of branch tags."
72    (branch-tag-check branch-name)    (branch-tag-check branch-name)
73    (in-sandbox-root-dir    (in-sandbox-root-dir
74      (chdir *mcvs-dir*)      (chdir *mcvs-dir*)
75      (let* ((branchpoint-tag (format nil "~a~aP" branch-name *branch-char*))      (let* ((branchpoint-tag (format nil "~a~abranch-point"
76                                        branch-name *branch-char*))
77             (this-branch (or (what-branch-are-we-on) "HEAD"))             (this-branch (or (what-branch-are-we-on) "HEAD"))
78             (even-merge-tag (format nil "~a~aM~a0" branch-name *branch-char*             (even-merge-tag (format nil "~a~amerged-to-~a-0" branch-name
79                                     this-branch))                                     *branch-char* this-branch))
80             (odd-merge-tag (format nil "~a~aM~a1" branch-name *branch-char*             (odd-merge-tag (format nil "~a~amerged-to-~a-1" branch-name
81                                    this-branch))                                    *branch-char* this-branch))
82             (symbols (with-input-from-program (s `("cvs"             (symbols (with-input-from-program (s `("cvs"
83                                                    ,@(format-opt global-options)                                                    ,@(format-opt global-options)
84                                                    "log" "-h" ,*mcvs-map-name*))                                                    "log" "-h" ,*mcvs-map-name*))

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

  ViewVC Help
Powered by ViewVC 1.1.5