277 |
(cvs-tree-merge (cdr tree1) (cdr tree2)))))) |
(cvs-tree-merge (cdr tree1) (cdr tree2)))))) |
278 |
((> l1 l2) |
((> l1 l2) |
279 |
(cvs-tree-merge |
(cvs-tree-merge |
280 |
(list (cons (cvs-tag-make (cvs-butlast vl1)) tree1)) tree2)) |
(list (cons (cvs-tag-make (butlast vl1)) tree1)) tree2)) |
281 |
((< l1 l2) |
((< l1 l2) |
282 |
(cvs-tree-merge |
(cvs-tree-merge |
283 |
tree1 (list (cons (cvs-tag-make (cvs-butlast vl2)) tree2))))))))) |
tree1 (list (cons (cvs-tag-make (butlast vl2)) tree2))))))))) |
284 |
|
|
285 |
(defun cvs-tag-make-tag (tag) |
(defun cvs-tag-make-tag (tag) |
286 |
(let ((vl (mapcar 'string-to-number (split-string (nth 2 tag) "\\.")))) |
(let ((vl (mapcar 'string-to-number (split-string (nth 2 tag) "\\.")))) |
293 |
(lambda (tag) |
(lambda (tag) |
294 |
(let ((tag (cvs-tag-make-tag tag))) |
(let ((tag (cvs-tag-make-tag tag))) |
295 |
(list (if (not (eq (cvs-tag->type tag) 'branch)) tag |
(list (if (not (eq (cvs-tag->type tag) 'branch)) tag |
296 |
(list (cvs-tag-make (cvs-butlast (cvs-tag->vlist tag))) |
(list (cvs-tag-make (butlast (cvs-tag->vlist tag))) |
297 |
tag))))) |
tag))))) |
298 |
tags))) |
tags))) |
299 |
(while (cdr tags) |
(while (cdr tags) |