From unknown Tue Jun 17 20:18:21 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#488 <488@debbugs.gnu.org> To: bug#488 <488@debbugs.gnu.org> Subject: Status: VC error: mark-resolved not implemented for CVS Reply-To: bug#488 <488@debbugs.gnu.org> Date: Wed, 18 Jun 2025 03:18:21 +0000 retitle 488 VC error: mark-resolved not implemented for CVS reassign 488 emacs submitter 488 Chong Yidong severity 488 normal thanks 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) From cyd@stupidchicken.com Wed Aug 27 13:31:52 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.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 Subject: Re: VC error: mark-resolved not implemented for CVS 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 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. From monnier@iro.umontreal.ca Wed Sep 24 13:04:11 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.7 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 20:04:11 +0000 Received: from ironport2-out.teksavvy.com (ironport2-out.pppoe.ca [206.248.154.182]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m8OK46Cn019188 for <488-done@emacsbugs.donarmstrong.com>; Wed, 24 Sep 2008 13:04:08 -0700 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AqYEANM52kjO+KDT/2dsb2JhbACBXrxKgWWBAw X-IronPort-AV: E=Sophos;i="4.33,303,1220241600"; d="scan'208";a="27465078" Received: from 206-248-160-211.dsl.teksavvy.com (HELO pastel.home) ([206.248.160.211]) by ironport2-out.teksavvy.com with ESMTP; 24 Sep 2008 16:04:01 -0400 Received: by pastel.home (Postfix, from userid 20848) id 0014F847E; Wed, 24 Sep 2008 16:04:00 -0400 (EDT) From: Stefan Monnier To: Chong Yidong Cc: Dan Nicolaescu , 488-done@debbugs.gnu.org Subject: Re: VC mark-resolved Message-ID: 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> <87prmtl5f8.fsf@cyd.mit.edu> Date: Wed, 24 Sep 2008 16:04:00 -0400 In-Reply-To: <87prmtl5f8.fsf@cyd.mit.edu> (Chong Yidong's message of "Wed, 24 Sep 2008 15:17:31 -0400") 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 >> > > 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. Thank you. It shouldn't issue a message, tho: if we want it, we'd want it in the backend-independent part of the code. Stefan From cyd@stupidchicken.com Wed Sep 24 13:15:19 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 20:15:20 +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 m8OKFGRZ023118 for <488-done@emacsbugs.donarmstrong.com>; Wed, 24 Sep 2008 13:15:17 -0700 Received: by cyd.mit.edu (Postfix, from userid 1000) id 01FBE57E189; Wed, 24 Sep 2008 16:15:44 -0400 (EDT) From: Chong Yidong To: Stefan Monnier Cc: Dan Nicolaescu , 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> <87prmtl5f8.fsf@cyd.mit.edu> Date: Wed, 24 Sep 2008 16:15:43 -0400 In-Reply-To: (Stefan Monnier's message of "Wed, 24 Sep 2008 16:04:00 -0400") Message-ID: <871vz9uwpc.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 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. > > Thank you. It shouldn't issue a message, tho: if we want it, we'd want > it in the backend-independent part of the code. If it doesn't issue a message, then there would be no feedback to the user that `C-x v v' did anything. That could be confusing. From monnier@iro.umontreal.ca Wed Sep 24 13:24:05 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.7 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 20:24:06 +0000 Received: from ironport2-out.teksavvy.com (ironport2-out.teksavvy.com [206.248.154.182]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m8OKO3li024704 for <488-done@emacsbugs.donarmstrong.com>; Wed, 24 Sep 2008 13:24:04 -0700 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AqYEAIU+2kjO+KDT/2dsb2JhbACBXrwegWWBAw X-IronPort-AV: E=Sophos;i="4.33,303,1220241600"; d="scan'208";a="27466210" Received: from 206-248-160-211.dsl.teksavvy.com (HELO pastel.home) ([206.248.160.211]) by ironport2-out.teksavvy.com with ESMTP; 24 Sep 2008 16:23:57 -0400 Received: by pastel.home (Postfix, from userid 20848) id 46479847E; Wed, 24 Sep 2008 16:23:57 -0400 (EDT) From: Stefan Monnier To: Chong Yidong Cc: Dan Nicolaescu , 488-done@debbugs.gnu.org Subject: Re: VC mark-resolved Message-ID: 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> <87prmtl5f8.fsf@cyd.mit.edu> <871vz9uwpc.fsf@cyd.mit.edu> Date: Wed, 24 Sep 2008 16:23:57 -0400 In-Reply-To: <871vz9uwpc.fsf@cyd.mit.edu> (Chong Yidong's message of "Wed, 24 Sep 2008 16:15:43 -0400") 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 >>>> > > 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. >> >> Thank you. It shouldn't issue a message, tho: if we want it, we'd want >> it in the backend-independent part of the code. > If it doesn't issue a message, then there would be no feedback to the > user that `C-x v v' did anything. That could be confusing. Again, if we want feedback, we need it to be in the backend-independent part of the code, not in the vc-*-mark-resolved method. Stefan From cyd@stupidchicken.com Wed Sep 24 13:27:30 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 20:27:30 +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 m8OKRRWl025882 for <488-done@emacsbugs.donarmstrong.com>; Wed, 24 Sep 2008 13:27:28 -0700 Received: by cyd.mit.edu (Postfix, from userid 1000) id 2902A57E189; Wed, 24 Sep 2008 16:27:55 -0400 (EDT) From: Chong Yidong To: Stefan Monnier Cc: Dan Nicolaescu , 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> <87prmtl5f8.fsf@cyd.mit.edu> <871vz9uwpc.fsf@cyd.mit.edu> Date: Wed, 24 Sep 2008 16:27:55 -0400 In-Reply-To: (Stefan Monnier's message of "Wed, 24 Sep 2008 16:23:57 -0400") Message-ID: <8763olmgqc.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 Stefan Monnier writes: > Again, if we want feedback, we need it to be in the backend-independent > part of the code, not in the vc-*-mark-resolved method. So you're saying to introduce ten different functions (vc-*-mark-resolved) that do the same thing? That's not pretty. From dann@mothra.ics.uci.edu Wed Sep 24 13:43:18 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.7 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 20:43:19 +0000 Received: from barrelv2.ics.uci.edu (barrelv2.ics.uci.edu [128.195.1.114]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m8OKhFLO029473 for <488-done@emacsbugs.donarmstrong.com>; Wed, 24 Sep 2008 13:43:16 -0700 Received: from mothra.ics.uci.edu (mothra.ics.uci.edu [128.195.6.93]) by barrelv2.ics.uci.edu (8.13.7+Sun/8.13.7) with ESMTP id m8OKh25F013630; Wed, 24 Sep 2008 13:43:03 -0700 (PDT) Received: (from dann@localhost) by mothra.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id m8OKh2ea020603; Wed, 24 Sep 2008 13:43:02 -0700 (PDT) Date: Wed, 24 Sep 2008 13:43:02 -0700 (PDT) Message-Id: <200809242043.m8OKh2ea020603@mothra.ics.uci.edu> From: Dan Nicolaescu To: Chong Yidong 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> <87prmtl5f8.fsf@cyd.mit.edu> <871vz9uwpc.fsf@cyd.mit.edu> In-Reply-To: <871vz9uwpc.fsf@cyd.mit.edu> (Chong Yidong's message of "Wed, 24 Sep 2008 16:15:43 -0400") Lines: 35 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: m8OKh25F013630 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@mothra.ics.uci.edu Chong Yidong 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. > > > > Thank you. It shouldn't issue a message, tho: if we want it, we'd want > > it in the backend-independent part of the code. > > If it doesn't issue a message, then there would be no feedback to the > user that `C-x v v' did anything. That could be confusing. Does this happen for any other VC backend besides CVS? I think (but I can't check at the moment) this only happens because the backend does not notice the VC state transition, it should not think that there is a conflict after it has been resolved. Maybe it's not too hard to test this theory: just make vc-stay-local-p always return nil and see what happens... From monnier@iro.umontreal.ca Wed Sep 24 14:10:56 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.7 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 21:10:57 +0000 Received: from ironport2-out.teksavvy.com (ironport2-out.teksavvy.com [206.248.154.182]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m8OLArbV004881 for <488-done@emacsbugs.donarmstrong.com>; Wed, 24 Sep 2008 14:10:54 -0700 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AqYEAMJJ2kjO+KDT/2dsb2JhbACBXrwfgWWBAw X-IronPort-AV: E=Sophos;i="4.33,303,1220241600"; d="scan'208";a="27468561" Received: from 206-248-160-211.dsl.teksavvy.com (HELO pastel.home) ([206.248.160.211]) by ironport2-out.teksavvy.com with ESMTP; 24 Sep 2008 17:10:48 -0400 Received: by pastel.home (Postfix, from userid 20848) id DBF4A847E; Wed, 24 Sep 2008 17:10:47 -0400 (EDT) From: Stefan Monnier To: Chong Yidong Cc: Dan Nicolaescu , 488-done@debbugs.gnu.org Subject: Re: VC mark-resolved Message-ID: 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> <87prmtl5f8.fsf@cyd.mit.edu> <871vz9uwpc.fsf@cyd.mit.edu> <8763olmgqc.fsf@cyd.mit.edu> Date: Wed, 24 Sep 2008 17:10:47 -0400 In-Reply-To: <8763olmgqc.fsf@cyd.mit.edu> (Chong Yidong's message of "Wed, 24 Sep 2008 16:27:55 -0400") 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 >> Again, if we want feedback, we need it to be in the backend-independent >> part of the code, not in the vc-*-mark-resolved method. > So you're saying to introduce ten different functions > (vc-*-mark-resolved) that do the same thing? That's not pretty. Not at all. I have no idea what you're talking about: backend-independent = code that calls (vc-call mark-resolved ...) So vc-default-mark-resolved should be an alias for `ignore' and the message should be in the code that calls (vc-call mark-resolved ...). Stefan From cyd@stupidchicken.com Wed Sep 24 14:17:59 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 21:17:59 +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 m8OLHurv006115 for <488-done@emacsbugs.donarmstrong.com>; Wed, 24 Sep 2008 14:17:57 -0700 Received: by cyd.mit.edu (Postfix, from userid 1000) id 7824D57E189; Wed, 24 Sep 2008 17:18:24 -0400 (EDT) From: Chong Yidong To: Stefan Monnier Cc: Dan Nicolaescu , 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> <87prmtl5f8.fsf@cyd.mit.edu> <871vz9uwpc.fsf@cyd.mit.edu> <8763olmgqc.fsf@cyd.mit.edu> Date: Wed, 24 Sep 2008 17:18:24 -0400 In-Reply-To: (Stefan Monnier's message of "Wed, 24 Sep 2008 17:10:47 -0400") Message-ID: <87ej395jkv.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 Stefan Monnier writes: >>> Again, if we want feedback, we need it to be in the backend-independent >>> part of the code, not in the vc-*-mark-resolved method. > >> So you're saying to introduce ten different functions >> (vc-*-mark-resolved) that do the same thing? That's not pretty. > > Not at all. I have no idea what you're talking about: > > backend-independent = code that calls (vc-call mark-resolved ...) > > So vc-default-mark-resolved should be an alias for `ignore' and the > message should be in the code that calls (vc-call mark-resolved ...). Okay, I misunderstood. But I still don't see why the message shouldn't be in vc-default-mark-resolved: if/when a backend actually implements mark-resolved, it may want to produce a completely different message. From monnier@iro.umontreal.ca Wed Sep 24 17:57:06 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.7 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; 25 Sep 2008 00:57:07 +0000 Received: from ironport2-out.teksavvy.com (ironport2-out.pppoe.ca [206.248.154.182]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m8P0v3v6028726 for <488-done@emacsbugs.donarmstrong.com>; Wed, 24 Sep 2008 17:57:04 -0700 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AqYEAPZ+2kjO+KDT/2dsb2JhbACBXrsDgWWBAw X-IronPort-AV: E=Sophos;i="4.33,304,1220241600"; d="scan'208";a="27474256" Received: from 206-248-160-211.dsl.teksavvy.com (HELO ceviche.home) ([206.248.160.211]) by ironport2-out.teksavvy.com with ESMTP; 24 Sep 2008 20:56:54 -0400 Received: by ceviche.home (Postfix, from userid 20848) id A8BD7B4194; Wed, 24 Sep 2008 20:56:54 -0400 (EDT) From: Stefan Monnier To: Chong Yidong Cc: Dan Nicolaescu , 488-done@debbugs.gnu.org Subject: Re: VC mark-resolved Message-ID: 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> <87prmtl5f8.fsf@cyd.mit.edu> <871vz9uwpc.fsf@cyd.mit.edu> <8763olmgqc.fsf@cyd.mit.edu> <87ej395jkv.fsf@cyd.mit.edu> Date: Wed, 24 Sep 2008 20:56:54 -0400 In-Reply-To: <87ej395jkv.fsf@cyd.mit.edu> (Chong Yidong's message of "Wed, 24 Sep 2008 17:18:24 -0400") 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 > But I still don't see why the message shouldn't be in > vc-default-mark-resolved: if/when a backend actually implements > mark-resolved, it may want to produce a completely different message. Hmm... I see what you mean, but I can't think of reason why that would ever be the case. I prefer we keep the code in the generic part for now. If we ever come into a case where the message would need to be different, we'll figure out what to do then. Stefan From cyd@stupidchicken.com Wed Sep 24 18:46:47 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; 25 Sep 2008 01:46:47 +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 m8P1kiRf008912 for <488-done@emacsbugs.donarmstrong.com>; Wed, 24 Sep 2008 18:46:45 -0700 Received: by cyd.mit.edu (Postfix, from userid 1000) id 84A8057E189; Wed, 24 Sep 2008 21:47:13 -0400 (EDT) From: Chong Yidong To: Stefan Monnier Cc: Dan Nicolaescu , 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> <87prmtl5f8.fsf@cyd.mit.edu> <871vz9uwpc.fsf@cyd.mit.edu> <8763olmgqc.fsf@cyd.mit.edu> <87ej395jkv.fsf@cyd.mit.edu> Date: Wed, 24 Sep 2008 21:47:13 -0400 In-Reply-To: (Stefan Monnier's message of "Wed, 24 Sep 2008 20:56:54 -0400") Message-ID: <87abdxq9ni.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 Stefan Monnier writes: >> But I still don't see why the message shouldn't be in >> vc-default-mark-resolved: if/when a backend actually implements >> mark-resolved, it may want to produce a completely different message. > > Hmm... I see what you mean, but I can't think of reason why that would > ever be the case. I prefer we keep the code in the generic part > for now. If we ever come into a case where the message would need to be > different, we'll figure out what to do then. Okay, I did that. From unknown Tue Jun 17 20:18:21 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: $requester Subject: Internal Control Message-Id: bug archived. Date: Thu, 23 Oct 2008 14:24:03 +0000 User-Agent: Fakemail v42.6.9 # A New Hope # A log time ago, in a galaxy far, far away # something happened. # # Magically this resulted in the following # action being taken, but this fake control # message doesn't tell you why it happened # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator