GNU bug report logs - #488
VC error: mark-resolved not implemented for CVS

Previous Next

Package: emacs;

Reported by: Chong Yidong <cyd <at> stupidchicken.com>

Date: Thu, 26 Jun 2008 21:50:03 UTC

Severity: normal

Done: Chong Yidong <cyd <at> stupidchicken.com>

Bug is archived. No further changes may be made.

Full log

View this message in rfc822 format

From: Chong Yidong <cyd <at> stupidchicken.com>
To: emacs-pretest-bug <at> gnu.org
Subject: bug#488: VC error: mark-resolved not implemented for CVS
Date: Thu, 26 Jun 2008 17:36:45 -0400

Suppose a CVS file is not up to date.  Set debug-on-error to t.  Make an
incompatible edit to the file, then do

C-x v v

Since the file is not up-to-date, this signals an error, as expected.
So do

C-x v +

to pull in the conflicting changes.  This adds the usual <<< and >>>
lines to the file.  After resolving the changes, try to check in the
file:

C-x v v 

The result:

Debugger entered--Lisp error: (error "Sorry, mark-resolved is not implemented for CVS")
  signal(error ("Sorry, mark-resolved is not implemented for CVS"))
  error("Sorry, %s is not implemented for %s" mark-resolved CVS)
  vc-call-backend(CVS mark-resolved ("/home/cyd/trunk/src/ChangeLog"))
  vc-mark-resolved(CVS ("/home/cyd/trunk/src/ChangeLog"))
  vc-next-action(nil)
  call-interactively(vc-next-action nil nil)
This bug report was last modified 15 years and 148 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.