Mercurial > emacs

comparison lisp/ediff-vers.el @ 20343:4327dd36b71b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new version
author Michael Kifer <kifer@cs.stonybrook.edu>
date Tue, 25 Nov 1997 02:10:08 +0000
parents f44ff2c52fac
children f7e788ea680b
comparison
equal deleted inserted replaced
20342:3739e4f90a55 20343:4327dd36b71b
335 ;; Ediff-merge appropriate revisions of the selected file. 335 ;; Ediff-merge appropriate revisions of the selected file.
336 (let* ((fileinfo (tin-cookie cvs-cookie-handle tin)) 336 (let* ((fileinfo (tin-cookie cvs-cookie-handle tin))
337 (type (cvs-fileinfo->type fileinfo)) 337 (type (cvs-fileinfo->type fileinfo))
338 (tmp-file 338 (tmp-file
339 (cvs-retrieve-revision-to-tmpfile fileinfo)) 339 (cvs-retrieve-revision-to-tmpfile fileinfo))
340 (default-directory
341 (file-name-as-directory (cvs-fileinfo->dir fileinfo)))
340 ancestor-file) 342 ancestor-file)
341 343
342 (or (memq type '(MERGED CONFLICT MODIFIED)) 344 (or (memq type '(MERGED CONFLICT MODIFIED))
343 (error 345 (error
344 "Can only merge `Modified', `Merged' or `Conflict' files")) 346 "Can only merge `Modified', `Merged' or `Conflict' files"))
354 (find-file-noselect (cvs-fileinfo->backup-file fileinfo)) 356 (find-file-noselect (cvs-fileinfo->backup-file fileinfo))
355 (find-file-noselect ancestor-file) 357 (find-file-noselect ancestor-file)
356 nil ; startup-hooks 358 nil ; startup-hooks
357 'ediff-merge-revisions-with-ancestor)) 359 'ediff-merge-revisions-with-ancestor))
358 ((eq type 'MODIFIED) 360 ((eq type 'MODIFIED)
359 (ediff-merge-buffers 361 (ediff-buffers
360 (find-file-noselect tmp-file) 362 (find-file-noselect tmp-file)
361 (find-file-noselect (cvs-fileinfo->full-path fileinfo)) 363 (find-file-noselect (cvs-fileinfo->full-path fileinfo))
362 nil ; startup-hooks 364 nil ; startup-hooks
363 'ediff-merge-revisions))) 365 'ediff-revisions)))
364 (if (stringp tmp-file) (delete-file tmp-file)) 366 (if (stringp tmp-file) (delete-file tmp-file))
365 (if (stringp ancestor-file) (delete-file ancestor-file)))) 367 (if (stringp ancestor-file) (delete-file ancestor-file))))
366 368
367 ;;; Local Variables: 369 ;;; Local Variables:
368 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) 370 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)