From unknown Sat Jun 21 10:45:36 2025 X-Loop: don@donarmstrong.com Subject: bug#488: VC error: mark-resolved not implemented for CVS Reply-To: Chong Yidong , 488@debbugs.gnu.org Resent-From: Chong Yidong Resent-To: bug-submit-list@lists.donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Thu, 26 Jun 2008 21:50:03 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 488 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Received: via spool by submit@emacsbugs.donarmstrong.com id=B.121451650119255 (code B ref -1); Thu, 26 Jun 2008 21:50:03 +0000 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 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) From unknown Sat Jun 21 10:45:36 2025 X-Loop: don@donarmstrong.com Subject: bug#488: VC error: mark-resolved not implemented for CVS Reply-To: Chong Yidong , 488@debbugs.gnu.org Resent-From: Chong Yidong Resent-To: bug-submit-list@lists.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: Received: via spool by 488-submit@emacsbugs.donarmstrong.com id=B488.121986911314850 (code B ref 488); Wed, 27 Aug 2008 20:40:05 +0000 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.7 required=4.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at 488) by emacsbugs.donarmstrong.com; 27 Aug 2008 20:31:53 +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 m7RKVnKu014844 for <488@emacsbugs.donarmstrong.com>; Wed, 27 Aug 2008 13:31:51 -0700 Received: by cyd.mit.edu (Postfix, from userid 1000) id DF90357E14D; Wed, 27 Aug 2008 16:33:39 -0400 (EDT) From: Chong Yidong To: emacs-devel@gnu.org Cc: 488@debbugs.gnu.org Date: Wed, 27 Aug 2008 16:33:39 -0400 Message-ID: <87bpzep598.fsf@cyd.mit.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii > 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? From unknown Sat Jun 21 10:45:36 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.420 (Entity 5.420) X-Loop: don@donarmstrong.com From: help-debbugs@gnu.org (Emacs bug Tracking System) To: Chong Yidong Subject: bug#488 closed by Chong Yidong (Re: VC mark-resolved) Message-ID: References: <87prmtl5f8.fsf@cyd.mit.edu> <87myl7dgk2.fsf@stupidchicken.com> X-Emacs-PR-Message: they-closed 488 X-Emacs-PR-Package: emacs Reply-To: 488@debbugs.gnu.org Content-Type: multipart/mixed; boundary="----------=_1222284304-9698-1" This is a multi-part message in MIME format... ------------=_1222284304-9698-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is an automatic notification regarding your bug report which was filed against the emacs package: #488: VC error: mark-resolved not implemented for CVS It has been closed by Chong Yidong . Their explanation is attached below along with your original report. If this explanation is unsatisfactory and you have not received a better one in a separate message then please contact Chong Yidong by replying to this email. --=20 488: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D488 Emacs Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1222284304-9698-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit >From cyd@stupidchicken.com Wed Sep 24 12:17:07 2008 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@debbugs.gnu.org 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-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit >From cyd@stupidchicken.com Thu Jun 26 14:41:41 2008 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-1--