/[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.10 by kaz, Tue Apr 16 20:43:44 2002 UTC revision 1.11 by kaz, Sun Sep 8 20:34:51 2002 UTC
# Line 132  and one of branch tags." Line 132  and one of branch tags."
132    
133        (when (not (or (null current-sticky)        (when (not (or (null current-sticky)
134                       (eq (first current-sticky) :branch)))                       (eq (first current-sticky) :branch)))
135          (t (error "mcvs-merge: working copy is currently updated to a non-branch tag.")))          (error "mcvs-merge: working copy is currently updated to a non-branch tag."))
136    
137        (setf this-branch (or (second current-sticky) "HEAD"))        (setf this-branch (or (second current-sticky) "HEAD"))
138    

Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11

  ViewVC Help
Powered by ViewVC 1.1.5