From: Karl Heuer <kwzh@gnu.org>
Date: Mon, 17 Jul 1995 23:04:30 +0000 (+0000)
Subject: (vc-backend-merge-news): Force to refetch the
X-Git-Tag: emacs-19.34~3293
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=25b80ac1466326706a8570d70aaa6c9e2b4b6038;p=emacs.git

(vc-backend-merge-news): Force to refetch the
properties after the merge.
---

diff --git a/lisp/vc.el b/lisp/vc.el
index cc27216dd69..80318b8c93d 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1897,7 +1897,11 @@ From a program, any arguments are passed to the `rcs2log' script."
    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 ()