From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: don@donarmstrong.com (Emacs bug Tracking System) Newsgroups: gmane.emacs.bugs Subject: bug#488: marked as done (VC error: mark-resolved not implemented for CVS) Date: Wed, 24 Sep 2008 12:25:04 -0700 Message-ID: References: <87prmtl5f8.fsf@cyd.mit.edu> <87myl7dgk2.fsf@stupidchicken.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----------=_1222284304-9698-0" X-Trace: ger.gmane.org 1222284617 13961 80.91.229.12 (24 Sep 2008 19:30:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 24 Sep 2008 19:30:17 +0000 (UTC) To: Chong Yidong Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Sep 24 21:31:14 2008 connect(): Connection refused 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 1Kia4o-000291-M5 for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Sep 2008 21:31:07 +0200 Original-Received: from localhost ([127.0.0.1]:56053 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kia3m-0003Fg-3k for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Sep 2008 15:30:02 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Kia3i-0003FT-7z for bug-gnu-emacs@gnu.org; Wed, 24 Sep 2008 15:29:58 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Kia3g-0003FE-NJ for bug-gnu-emacs@gnu.org; Wed, 24 Sep 2008 15:29:56 -0400 Original-Received: from [199.232.76.173] (port=39629 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kia3g-0003FB-Gy for bug-gnu-emacs@gnu.org; Wed, 24 Sep 2008 15:29:56 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:57155) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Kia3g-0000jb-1X for bug-gnu-emacs@gnu.org; Wed, 24 Sep 2008 15:29:56 -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 m8OJTsNd010852; Wed, 24 Sep 2008 12:29:54 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id m8OJP4o4009808; Wed, 24 Sep 2008 12:25:04 -0700 X-Mailer: MIME-tools 5.420 (Entity 5.420) X-Loop: don@donarmstrong.com X-Emacs-PR-Message: closed 488 X-Emacs-PR-Package: emacs X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:20731 Archived-At: This is a multi-part message in MIME format... ------------=_1222284304-9698-0 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 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.) --=20 488: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=3D488 Emacs Bug Tracking System Contact don@donarmstrong.com with problems ------------=_1222284304-9698-0 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-4.4 required=4.0 tests=AWL,BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at submit) by emacsbugs.donarmstrong.com; 26 Jun 2008 21:41:41 +0000 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m5QLfcef019249 for ; Thu, 26 Jun 2008 14:41:39 -0700 Received: from mx10.gnu.org ([199.232.76.166]:58537) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1KBzDc-0004d6-Cc for emacs-pretest-bug@gnu.org; Thu, 26 Jun 2008 17:41:28 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1KBzDi-0003xR-Th for emacs-pretest-bug@gnu.org; Thu, 26 Jun 2008 17:41:37 -0400 Received: from cyd.mit.edu ([18.115.2.24]:42125) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KBzDi-0003xL-MT for emacs-pretest-bug@gnu.org; Thu, 26 Jun 2008 17:41:34 -0400 Received: by cyd.mit.edu (Postfix, from userid 1000) id 9CB384E474; Thu, 26 Jun 2008 17:36:45 -0400 (EDT) From: Chong Yidong 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> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2) 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) ------------=_1222284304-9698-0 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-3.8 required=4.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at 488-done) by emacsbugs.donarmstrong.com; 24 Sep 2008 19:17:08 +0000 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 m8OJH4OA008465 for <488-done@emacsbugs.donarmstrong.com>; Wed, 24 Sep 2008 12:17:05 -0700 Received: by cyd.mit.edu (Postfix, from userid 1000) id 6598D57E189; Wed, 24 Sep 2008 15:17:31 -0400 (EDT) From: Chong Yidong To: Dan Nicolaescu Cc: Stefan Monnier , 488-done@emacsbugs.donarmstrong.com Subject: Re: VC mark-resolved References: <877i9vfwxz.fsf@cyd.mit.edu> <200809012330.m81NU6Zr010174@sallyv1.ics.uci.edu> <87hc8z5ivq.fsf@cyd.mit.edu> <87ej422pg3.fsf@cyd.mit.edu> <200809030618.m836Ii9k009089@sallyv1.ics.uci.edu> Date: Wed, 24 Sep 2008 15:17:31 -0400 In-Reply-To: <200809030618.m836Ii9k009089@sallyv1.ics.uci.edu> (Dan Nicolaescu's message of "Tue, 02 Sep 2008 23:18:44 -0700") Message-ID: <87prmtl5f8.fsf@cyd.mit.edu> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Dan Nicolaescu writes: > Stefan Monnier 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. ------------=_1222284304-9698-0--