Mercurial > emacs

changeset 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 c0a5d0d00c18
children 7318536fb256
files lisp/vc.el
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc.el	Mon Jul 17 23:03:53 1995 +0000
+++ b/lisp/vc.el	Mon Jul 17 23:04:30 1995 +0000
@@ -1897,7 +1897,11 @@
    file
    (error "vc-backend-merge-news not meaningful for SCCS files") ;SCCS
    (error "vc-backend-merge-news not meaningful for RCS files")	;RCS
-   (vc-do-command 1 "cvs" file 'WORKFILE "update") ;CVS
+   (progn  ; CVS
+     (vc-file-clear-masterprops file)
+     (vc-file-setprop file 'vc-workfile-version nil)
+     (vc-file-setprop file 'vc-locking-user nil)
+     (vc-do-command 1 "cvs" file 'WORKFILE "update"))
    ))
 
 (defun vc-check-headers ()