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

Previous Next

Full log

Message #10 received at 488 <at> emacsbugs.donarmstrong.com (full text, mbox):

From: Chong Yidong <cyd <at> stupidchicken.com>
To: emacs-devel <at> gnu.org
Cc: 488 <at> debbugs.gnu.org
Subject: Re: VC error: mark-resolved not implemented for CVS
Date: Wed, 27 Aug 2008 16:33:39 -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.
>
> C-x v +
>
> to pull in the conflicting changes.  After resolving the changes,
>
> C-x v v 
>
> Debugger entered--Lisp error: (error "Sorry, mark-resolved is not
> implemented for CVS")

I noticed that doing C-x v + twice causes the file to be marked as
up-to-date.  So maybe C-x v v, when called on a CVS file marked as
conflicted, should try to run `vc-update' again.

Any thoughts?

Previous Next

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