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

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

[Chong Yidong]

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)

bug#488: marked as done (VC error: mark-resolved not implemented for CVS)

[Emacs bug Tracking System]

[-- Attachment #1: Type: text/plain, Size: 822 bytes --]


Your message dated Wed, 24 Sep 2008 15:17:31 -0400
with message-id <87prmtl5f8.fsf@cyd.mit.edu>
and subject line Re: VC mark-resolved
has caused the Emacs bug report #488,
regarding VC error: mark-resolved not implemented for CVS
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact don@donarmstrong.com
immediately.)


-- 
488: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=488
Emacs Bug Tracking System
Contact don@donarmstrong.com with problems

[-- Attachment #2: Type: message/rfc822, Size: 2446 bytes --]

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

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)



[-- Attachment #3: Type: message/rfc822, Size: 2386 bytes --]

From: Chong Yidong <cyd@stupidchicken.com>
To: Dan Nicolaescu <dann@ics.uci.edu>
Cc: Stefan Monnier <monnier@iro.umontreal.ca>, 488-done@emacsbugs.donarmstrong.com
Subject: Re: VC mark-resolved
Date: Wed, 24 Sep 2008 15:17:31 -0400
Message-ID: <87prmtl5f8.fsf@cyd.mit.edu>

Dan Nicolaescu <dann@ics.uci.edu> writes:

> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>
>   > > CVS is hardly alone.  In fact, it seems that no other back-end
>   > > implements the mark-resolved action: I tried grepping for
>   > > `mark-resolved' in the vc-*.el files and came up with nothing.
>   > 
>   > There should be a (defalias 'vc-cvs-mark-resolved 'ignore)
>   > Or maybe even (defalias 'vc-default-mark-resolved 'ignore).
>   > But in any case, it seems like the mark-resolved thingy was not
>   > fully implemented if none of the backends define it.
>
> Yep, a pointer to a relevant discussion: 
> http://article.gmane.org/gmane.emacs.devel/94816

I checked in a new function, vc-default-mark-resolved, into vc.el.  It
does nothing except issue a message saying the conflict is resolved.
Someone else can write the vc-*-mark-resolved functions at a later date;
for now, at least `C-x v v' doesn't get stuck at the error.