unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Chong Yidong <cyd@stupidchicken.com>
To: emacs-devel@gnu.org
Cc: 488@emacsbugs.donarmstrong.com
Subject: bug#488: VC error: mark-resolved not implemented for CVS
Date: Wed, 27 Aug 2008 16:33:39 -0400	[thread overview]
Message-ID: <87bpzep598.fsf__11431.0637735345$1219870126$gmane$org@cyd.mit.edu> (raw)

> 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?






             reply	other threads:[~2008-08-27 20:33 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-27 20:33 Chong Yidong [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-06-26 21:36 bug#488: VC error: mark-resolved not implemented for CVS Chong Yidong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='87bpzep598.fsf__11431.0637735345$1219870126$gmane$org@cyd.mit.edu' \
    --to=cyd@stupidchicken.com \
    --cc=488@emacsbugs.donarmstrong.com \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).