From: Chong Yidong <cyd@stupidchicken.com>
To: emacs-pretest-bug@gnu.org
Subject: bug#488: VC error: mark-resolved not implemented for CVS
Date: Thu, 26 Jun 2008 17:36:45 -0400 [thread overview]
Message-ID: <87myl7dgk2.fsf@stupidchicken.com> (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.
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)
next reply other threads:[~2008-06-26 21:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <87prmtl5f8.fsf@cyd.mit.edu>
2008-06-26 21:36 ` Chong Yidong [this message]
2008-09-24 19:25 ` bug#488: marked as done (VC error: mark-resolved not implemented for CVS) Emacs bug Tracking System
2008-08-27 20:33 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=87myl7dgk2.fsf@stupidchicken.com \
--to=cyd@stupidchicken.com \
--cc=488@emacsbugs.donarmstrong.com \
--cc=emacs-pretest-bug@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).