* Re: VC error: mark-resolved not implemented for CVS
@ 2008-08-27 20:33 Chong Yidong
0 siblings, 0 replies; only message in thread
From: Chong Yidong @ 2008-08-27 20:33 UTC (permalink / raw)
To: emacs-devel; +Cc: 488
> 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?
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-08-27 20:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-27 20:33 VC error: mark-resolved not implemented for CVS Chong Yidong
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).