Mercurial > emacs

comparison lisp/vc.el @ 12566:844b502ac6d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-backend-merge-news): Force to refetch the properties after the merge.
author Karl Heuer <kwzh@gnu.org>
date Mon, 17 Jul 1995 23:04:30 +0000
parents 7d4615a12286
children 9aaf593a2be2
comparison
equal deleted inserted replaced
12565:c0a5d0d00c18 12566:844b502ac6d0
1895 ;; Merge in any new changes made to FILE. 1895 ;; Merge in any new changes made to FILE.
1896 (vc-backend-dispatch 1896 (vc-backend-dispatch
1897 file 1897 file
1898 (error "vc-backend-merge-news not meaningful for SCCS files") ;SCCS 1898 (error "vc-backend-merge-news not meaningful for SCCS files") ;SCCS
1899 (error "vc-backend-merge-news not meaningful for RCS files") ;RCS 1899 (error "vc-backend-merge-news not meaningful for RCS files") ;RCS
1900 (vc-do-command 1 "cvs" file 'WORKFILE "update") ;CVS 1900 (progn ; CVS
1901 (vc-file-clear-masterprops file)
1902 (vc-file-setprop file 'vc-workfile-version nil)
1903 (vc-file-setprop file 'vc-locking-user nil)
1904 (vc-do-command 1 "cvs" file 'WORKFILE "update"))
1901 )) 1905 ))
1902 1906
1903 (defun vc-check-headers () 1907 (defun vc-check-headers ()
1904 "Check if the current file has any headers in it." 1908 "Check if the current file has any headers in it."
1905 (interactive) 1909 (interactive)