From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.bugs Subject: bug#488: VC error: mark-resolved not implemented for CVS Date: Wed, 27 Aug 2008 16:33:39 -0400 Message-ID: <87bpzep598.fsf__11431.0637735345$1219870126$gmane$org@cyd.mit.edu> Reply-To: Chong Yidong , 488@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1219870066 23492 80.91.229.12 (27 Aug 2008 20:47:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 Aug 2008 20:47:46 +0000 (UTC) Cc: 488@emacsbugs.donarmstrong.com To: emacs-devel@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Aug 27 22:48:39 2008 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1KYRwV-00074r-4n for geb-bug-gnu-emacs@m.gmane.org; Wed, 27 Aug 2008 22:48:39 +0200 Original-Received: from localhost ([127.0.0.1]:33080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KYRvX-0006vt-0j for geb-bug-gnu-emacs@m.gmane.org; Wed, 27 Aug 2008 16:47:39 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KYRvT-0006v5-2B for bug-gnu-emacs@gnu.org; Wed, 27 Aug 2008 16:47:35 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KYRvR-0006sw-GU for bug-gnu-emacs@gnu.org; Wed, 27 Aug 2008 16:47:34 -0400 Original-Received: from [199.232.76.173] (port=36312 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KYRvR-0006sj-DH for bug-gnu-emacs@gnu.org; Wed, 27 Aug 2008 16:47:33 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:47607) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KYRvQ-000230-N7 for bug-gnu-emacs@gnu.org; Wed, 27 Aug 2008 16:47:33 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m7RKlTMZ019768; Wed, 27 Aug 2008 13:47:30 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id m7RKe5Vg016934; Wed, 27 Aug 2008 13:40:05 -0700 X-Loop: don@donarmstrong.com Resent-From: Chong Yidong Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Wed, 27 Aug 2008 20:40:05 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 488 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 488-submit@emacsbugs.donarmstrong.com id=B488.121986911314850 (code B ref 488); Wed, 27 Aug 2008 20:40:05 +0000 Original-Received: (at 488) by emacsbugs.donarmstrong.com; 27 Aug 2008 20:31:53 +0000 Original-Received: from cyd.mit.edu (CYD.MIT.EDU [18.115.2.24]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m7RKVnKu014844 for <488@emacsbugs.donarmstrong.com>; Wed, 27 Aug 2008 13:31:51 -0700 Original-Received: by cyd.mit.edu (Postfix, from userid 1000) id DF90357E14D; Wed, 27 Aug 2008 16:33:39 -0400 (EDT) X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) Resent-Date: Wed, 27 Aug 2008 16:47:34 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:19783 Archived-At: > 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?