From unknown Sun Aug 17 22:06:41 2025 X-Loop: owner@emacsbugs.donarmstrong.com Subject: bug#4179: vc-merge with svn: syntax error in revision arg. Reply-To: Dieter Wilhelm , 4179@debbugs.gnu.org Resent-From: Dieter Wilhelm Resent-To: bug-submit-list@lists.donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Mon, 17 Aug 2009 17:40:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-Emacs-PR-Message: report 4179 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Received: via spool by submit@emacsbugs.donarmstrong.com id=B.125053051730065 (code B ref -1); Mon, 17 Aug 2009 17:40:07 +0000 Received: (at submit) by emacsbugs.donarmstrong.com; 17 Aug 2009 17:35:17 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=0.1 required=4.0 tests=FOURLA autolearn=no version=3.2.5-bugs.debian.org_2005_01_02 Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n7HHZEkU029996 for ; Mon, 17 Aug 2009 10:35:16 -0700 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Md670-0007QF-E6 for bug-gnu-emacs@gnu.org; Mon, 17 Aug 2009 13:35:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Md66v-0007OD-EF for bug-gnu-emacs@gnu.org; Mon, 17 Aug 2009 13:35:14 -0400 Received: from [199.232.76.173] (port=42549 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Md66v-0007O8-80 for bug-gnu-emacs@gnu.org; Mon, 17 Aug 2009 13:35:09 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:53232) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Md66u-0001aj-Lz for bug-gnu-emacs@gnu.org; Mon, 17 Aug 2009 13:35:09 -0400 Received: from urmel.duenenhof-wilhelm.de (p54A70CCE.dip0.t-ipconnect.de [84.167.12.206]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MKsym-1Md66q2KUS-000la3; Mon, 17 Aug 2009 19:35:04 +0200 Received: from dieter by urmel.duenenhof-wilhelm.de with local (Exim 4.69) (envelope-from ) id 1Md66n-00046Q-Vg for bug-gnu-emacs@gnu.org; Mon, 17 Aug 2009 19:35:01 +0200 To: bug-gnu-emacs@gnu.org From: Dieter Wilhelm Date: Mon, 17 Aug 2009 19:34:56 +0200 Message-ID: <87my5ycpj3.fsf@urmel.duenenhof-wilhelm.de> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Provags-ID: V01U2FsdGVkX1+ZA95eQghraRwOsN7qhfrF18mb4POFz97KQ+Z 4NLPxX+uHQUz6mssIsngQq93isfuts8gkd6aVnxt3Jo0VqGl+I mlpOxGgdLZqXkSMHHK/Iw== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Please write in English if possible, because the Emacs maintainers usually do not have translators to read other languages for them. Your bug report will be posted to the bug-gnu-emacs@gnu.org mailing list, and to the gnu.emacs.bug news group. Please describe exactly what actions triggered the bug and the precise symptoms of the bug: ------------------------------------------------------------ Hi, when running `vc-merge' for a subversion controlled file (this happens also with Emacs 23.1.50 by the way) with an integer argument (I'd like to specify two svn revision numbers), I'm tumbling into this: svn: Syntax error in revision argument ':10' (What I'd like to submit to svn is this: svn merge -r '10:8' ...) vc-merge (in vc.el) thinks that an integer is a branch ID instead of a svn revision # because of the following function: (defun vc-branch-p (rev) "Return t if REV is a branch revision." (not (eq nil (string-match "\\`[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*\\'" rev)))) Thanks for your good work Dieter ------------------------------------------------------------ If Emacs crashed, and you have the Emacs process in the gdb debugger, please include the output from the following gdb commands: `bt full' and `xbacktrace'. If you would like to further debug the crash, please read the file /usr/share/emacs/22.2/etc/DEBUG for instructions. In GNU Emacs 22.2.1 (i486-pc-linux-gnu, GTK+ Version 2.12.11) of 2008-11-09 on raven, modified by Debian Windowing system distributor `The X.Org Foundation', version 11.0.10402000 configured using `configure '--build=i486-linux-gnu' '--host=i486-linux-gnu' '--prefix=/usr' '--sharedstatedir=/var/lib' '--libexecdir=/usr/lib' '--localstatedir=/var/lib' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--with-pop=yes' '--enable-locallisppath=/etc/emacs22:/etc/emacs:/usr/local/share/emacs/22.2/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/22.2/site-lisp:/usr/share/emacs/site-lisp:/usr/share/emacs/22.2/leim' '--with-x=yes' '--with-x-toolkit=gtk' '--with-toolkit-scroll-bars' 'build_alias=i486-linux-gnu' 'host_alias=i486-linux-gnu' 'CFLAGS=-DDEBIAN -g -O2' 'LDFLAGS=-g' 'CPPFLAGS='' Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: en_US.UTF-8 locale-coding-system: utf-8 default-enable-multibyte-characters: t Major mode: Fundamental Minor modes in effect: shell-dirtrack-mode: t display-time-mode: t show-paren-mode: t tooltip-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t unify-8859-on-encoding-mode: t utf-translate-cjk-mode: t auto-compression-mode: t column-number-mode: t line-number-mode: t transient-mark-mode: t abbrev-mode: t Recent input: C-x C-f d i s c C-r C-s C-s y C-x v l C-x v m 1 0 M-x r e p o r t Recent messages: Loading mule-util...done Marking holidays...done Marking diary entries...done For information about GNU Emacs and the GNU system, type C-h C-a. Please type y, n, or !: Running svn in the background... done Loading log-view...done vc-do-command: Running svn...FAILED (status 1) Making completion list... Loading emacsbug...done From unknown Sun Aug 17 22:06:41 2025 X-Loop: owner@emacsbugs.donarmstrong.com Subject: bug#4179: vc-merge with svn: syntax error in revision arg. Reply-To: Dan Nicolaescu , 4179@debbugs.gnu.org Resent-From: Dan Nicolaescu Resent-To: bug-submit-list@lists.donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Thu, 20 Aug 2009 20:37:23 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-Emacs-PR-Message: followup 4179 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Received: via spool by 4179-submit@emacsbugs.donarmstrong.com id=B4179.125073716516541 (code B ref 4179); Thu, 20 Aug 2009 20:37:23 +0000 Received: (at 4179) by emacsbugs.donarmstrong.com; 20 Aug 2009 02:59:25 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-6.8 required=4.0 tests=AWL,HAS_BUG_NUMBER, X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from barrelv2.ics.uci.edu (barrelv2.ics.uci.edu [128.195.1.114]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n7K2xOec016536 for <4179@emacsbugs.donarmstrong.com>; Wed, 19 Aug 2009 19:59:25 -0700 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by barrelv2.ics.uci.edu (8.13.8+Sun/8.13.8) with ESMTP id n7K2x9hU015564; Wed, 19 Aug 2009 19:59:09 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n7K2x8sj004573; Wed, 19 Aug 2009 19:59:08 -0700 (PDT) Date: Wed, 19 Aug 2009 19:59:08 -0700 (PDT) Message-Id: <200908200259.n7K2x8sj004573@godzilla.ics.uci.edu> From: Dan Nicolaescu To: Dieter Wilhelm Cc: 4179@debbugs.gnu.org, Stefan Monnier References: <87my5ycpj3.fsf@urmel.duenenhof-wilhelm.de> In-Reply-To: <87my5ycpj3.fsf@urmel.duenenhof-wilhelm.de> (Dieter Wilhelm's message of "Mon, 17 Aug 2009 19:34:56 +0200") Lines: 43 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: n7K2x9hU015564 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.363, required 5, autolearn=disabled, ALL_TRUSTED -1.44, TW_SV 0.08) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu Dieter Wilhelm writes: > Hi, > > when running `vc-merge' for a subversion controlled file (this happens > also with Emacs 23.1.50 by the way) with an integer argument (I'd like > to specify two svn revision numbers), I'm tumbling into this: > > svn: Syntax error in revision argument ':10' > > (What I'd like to submit to svn is this: svn merge -r '10:8' ...) > > vc-merge (in vc.el) thinks that an integer is a branch ID instead of a > svn revision # because of the following function: > > (defun vc-branch-p (rev) > "Return t if REV is a branch revision." > (not (eq nil (string-match "\\`[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*\\'" rev)))) Good catch! This function is from the time when RCS style revision numbers where the only thing supported, here's what the comment in the code says: ;; functions that operate on RCS revision numbers. This code should ;; also be moved into the backends. It stays for now, however, since ;; it is used in code below. Stefan, how would you go about making these functions backend specific: (defun vc-trunk-p (rev) (defun vc-branch-p (rev) (defun vc-branch-part (rev) (defun vc-minor-part (rev) It seems to me that only `vc-branch-p' needs to be backend specific, the rest are only used by RCS and CVS. vc-default-{previous,next}-revision use them, but they can go into vc-rcs (or vc-cvs) and make one use the other (there's a precedent, vc-cvs-comment-history uses an RCS backend function...). Do you see an elegant way of dealing with this? From unknown Sun Aug 17 22:06:41 2025 X-Loop: owner@emacsbugs.donarmstrong.com Subject: bug#4179: vc-merge with svn: syntax error in revision arg. Reply-To: Stefan Monnier , 4179@debbugs.gnu.org Resent-From: Stefan Monnier Resent-To: bug-submit-list@lists.donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Tue, 25 Aug 2009 18:15:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-Emacs-PR-Message: followup 4179 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Received: via spool by 4179-submit@emacsbugs.donarmstrong.com id=B4179.12512236245761 (code B ref 4179); Tue, 25 Aug 2009 18:15:05 +0000 Received: (at 4179) by emacsbugs.donarmstrong.com; 25 Aug 2009 18:07:04 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-4.3 required=4.0 tests=AWL,HAS_BUG_NUMBER autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from pruche.dit.umontreal.ca (pruche.dit.umontreal.ca [132.204.246.22]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n7PI720j005752 for <4179@emacsbugs.donarmstrong.com>; Tue, 25 Aug 2009 11:07:03 -0700 Received: from faina.iro.umontreal.ca (faina.iro.umontreal.ca [132.204.26.177]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id n7PI6wq0029092; Tue, 25 Aug 2009 14:06:58 -0400 Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 7ADE73A06B; Tue, 25 Aug 2009 14:06:58 -0400 (EDT) From: Stefan Monnier To: Dan Nicolaescu Cc: Dieter Wilhelm , 4179@debbugs.gnu.org Message-ID: References: <87my5ycpj3.fsf@urmel.duenenhof-wilhelm.de> <200908200259.n7K2x8sj004573@godzilla.ics.uci.edu> Date: Tue, 25 Aug 2009 14:06:58 -0400 In-Reply-To: <200908200259.n7K2x8sj004573@godzilla.ics.uci.edu> (Dan Nicolaescu's message of "Wed, 19 Aug 2009 19:59:08 -0700 (PDT)") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3348=0 > Stefan, how would you go about making these functions backend specific: > (defun vc-trunk-p (rev) > (defun vc-branch-p (rev) > (defun vc-branch-part (rev) > (defun vc-minor-part (rev) Not sure: for some backends (svn, bzr, darcs at least), they simply don't make any sense. > It seems to me that only `vc-branch-p' needs to be backend specific, the > rest are only used by RCS and CVS. That sounds right. > vc-default-{previous,next}-revision use them, but they can go into > vc-rcs (or vc-cvs) and make one use the other (there's a precedent, > vc-cvs-comment-history uses an RCS backend function...). > Do you see an elegant way of dealing with this? Move them to vc-rcs. Stefan From unknown Sun Aug 17 22:06:41 2025 X-Loop: owner@emacsbugs.donarmstrong.com Subject: bug#4179: vc-merge with svn: syntax error in revision arg. Reply-To: Dan Nicolaescu , 4179@debbugs.gnu.org Resent-From: Dan Nicolaescu Resent-To: bug-submit-list@lists.donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Wed, 26 Aug 2009 18:10:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-Emacs-PR-Message: followup 4179 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Received: via spool by 4179-submit@emacsbugs.donarmstrong.com id=B4179.125130992310521 (code B ref 4179); Wed, 26 Aug 2009 18:10:08 +0000 Received: (at 4179) by emacsbugs.donarmstrong.com; 26 Aug 2009 18:05:23 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-6.7 required=4.0 tests=AWL,HAS_BUG_NUMBER, X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from barrelv2.ics.uci.edu (barrelv2.ics.uci.edu [128.195.1.114]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n7QI5LdT010282 for <4179@emacsbugs.donarmstrong.com>; Wed, 26 Aug 2009 11:05:22 -0700 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by barrelv2.ics.uci.edu (8.13.8+Sun/8.13.8) with ESMTP id n7QI4wuj023207; Wed, 26 Aug 2009 11:04:58 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n7QI4vh7023115; Wed, 26 Aug 2009 11:04:57 -0700 (PDT) Date: Wed, 26 Aug 2009 11:04:57 -0700 (PDT) Message-Id: <200908261804.n7QI4vh7023115@godzilla.ics.uci.edu> From: Dan Nicolaescu To: Stefan Monnier Cc: 4179@debbugs.gnu.org, Dieter Wilhelm References: <87my5ycpj3.fsf@urmel.duenenhof-wilhelm.de> <200908200259.n7K2x8sj004573@godzilla.ics.uci.edu> In-Reply-To: (Stefan Monnier's message of "Tue, 25 Aug 2009 14:06:58 -0400") Lines: 52 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: n7QI4wuj023207 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@godzilla.ics.uci.edu Stefan Monnier writes: > > vc-default-{previous,next}-revision use them, but they can go into > > vc-rcs (or vc-cvs) and make one use the other (there's a precedent, > > vc-cvs-comment-history uses an RCS backend function...). > > > Do you see an elegant way of dealing with this? > > Move them to vc-rcs. I did that. > > Stefan, how would you go about making these functions backend specific: > > > (defun vc-trunk-p (rev) > > (defun vc-branch-p (rev) > > (defun vc-branch-part (rev) > > (defun vc-minor-part (rev) > > Not sure: for some backends (svn, bzr, darcs at least), they simply > don't make any sense. > > > It seems to me that only `vc-branch-p' needs to be backend specific, the > > rest are only used by RCS and CVS. > > That sounds right. Also moved + renamed vc-trunk-p and vc-minor-part to vc-rcs.el, they are only used in that file now. All the above turned out to be a good cleanup, but unfortunately not necessarily related to the problem in this bug report. We have this code in `vc-merge' (if (string= first-revision "") (setq status (vc-call-backend backend 'merge-news file)) (if (not (vc-find-backend-function backend 'merge)) (error "Sorry, merging is not implemented for %s" backend) (if (not (vc-branch-p first-revision)) (setq second-revision (read-string "Second revision: " (concat (vc-branch-part first-revision) "."))) ;; We want to merge an entire branch. Set revisions ;; accordingly, so that vc-BACKEND-merge understands us. (setq second-revision first-revision) ;; first-revision must be the starting point of the branch (setq first-revision (vc-branch-part first-revision))) `vc-branch-p' can be made VC backend specific. But what should we do with `vc-branch-part'? What should be the new structure of this code? From unknown Sun Aug 17 22:06:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#4179: vc-merge with svn: syntax error in revision arg. Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 27 Aug 2021 03:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 4179 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dan Nicolaescu Cc: Dieter Wilhelm , Dmitry Gutov , Stefan Monnier , 4179@debbugs.gnu.org Received: via spool by 4179-submit@debbugs.gnu.org id=B4179.163003362627766 (code B ref 4179); Fri, 27 Aug 2021 03:08:02 +0000 Received: (at 4179) by debbugs.gnu.org; 27 Aug 2021 03:07:06 +0000 Received: from localhost ([127.0.0.1]:50896 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJSCv-0007Dm-Qi for submit@debbugs.gnu.org; Thu, 26 Aug 2021 23:07:06 -0400 Received: from quimby.gnus.org ([95.216.78.240]:54468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJSCu-0007DI-42 for 4179@debbugs.gnu.org; Thu, 26 Aug 2021 23:07:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bu+DKgPjkoUpygyM7JNU5hUsaZ7b96TQ2fabTl4Y9DY=; b=I81rjhVcuVdtAVXjcG8fjAZAv2 tkfxsKXqzZMXXf5hcCzJ0jap2tvtM/ZCpNf7pGfKCPqbvvveHEWz1i8zRN94ai9GjwHfDOX3j2j+1 jphOdYuQYuwZGEw6hVtL6Up0iZnUG8TpNMF88CT+hXI6fghkFMVefL1EEE40pSAUG2aA=; Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mJSCg-0001AL-Ku; Fri, 27 Aug 2021 05:06:55 +0200 From: Lars Ingebrigtsen References: <87my5ycpj3.fsf@urmel.duenenhof-wilhelm.de> <200908200259.n7K2x8sj004573@godzilla.ics.uci.edu> <200908261804.n7QI4vh7023115@godzilla.ics.uci.edu> Date: Fri, 27 Aug 2021 05:06:50 +0200 In-Reply-To: <200908261804.n7QI4vh7023115@godzilla.ics.uci.edu> (Dan Nicolaescu's message of "Wed, 26 Aug 2009 11:04:57 -0700 (PDT)") Message-ID: <878s0nsi0l.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Dan Nicolaescu writes: > We have this code in `vc-merge' > > (if (string= first-revision "") > (setq status (vc-call-backend backend 'merge-news file)) > (if (not (vc-find-backend-function backend 'merge)) > (error "Sorry, [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Dan Nicolaescu writes: > We have this code in `vc-merge' > > (if (string= first-revision "") > (setq status (vc-call-backend backend 'merge-news file)) > (if (not (vc-find-backend-function backend 'merge)) > (error "Sorry, merging is not implemented for %s" backend) > (if (not (vc-branch-p first-revision)) > (setq second-revision > (read-string "Second revision: " > (concat (vc-branch-part first-revision) "."))) > ;; We want to merge an entire branch. Set revisions > ;; accordingly, so that vc-BACKEND-merge understands us. > (setq second-revision first-revision) > ;; first-revision must be the starting point of the branch > (setq first-revision (vc-branch-part first-revision))) > > `vc-branch-p' can be made VC backend specific. > But what should we do with `vc-branch-part'? > What should be the new structure of this code? (I'm going through old bug reports that unfortunately weren't resolved at the time.) This code has changed a lot in the 12 years since this was discussed -- does anybody know whether the originally reported problem has been fixed or not? Also: ;; functions that operate on RCS revision numbers. This code should ;; also be moved into the backends. It stays for now, however, since ;; it is used in code below. (defun vc-branch-p (rev) "Return t if REV is a branch revision." (not (eq nil (string-match "\\`[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*\\'" rev)))) ;;;###autoload (defun vc-branch-part (rev) "Return the branch part of a revision number REV." (let ((index (string-match "\\.[0-9]+\\'" rev))) (when index (substring rev 0 index)))) The comment there is wrong -- it's no longer used in vc.el. Perhaps these two functions should be moved to vc-rcs.el (and renamed (with obsolete aliases))? (They're only used in vc-rcs.el and vc-vcs.el.) I've added Dmitry to the CCs; perhaps he has some comments. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 26 23:07:15 2021 Received: (at control) by debbugs.gnu.org; 27 Aug 2021 03:07:15 +0000 Received: from localhost ([127.0.0.1]:50899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJSD5-0007EC-3X for submit@debbugs.gnu.org; Thu, 26 Aug 2021 23:07:15 -0400 Received: from quimby.gnus.org ([95.216.78.240]:54486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJSD3-0007Dw-5g for control@debbugs.gnu.org; Thu, 26 Aug 2021 23:07:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Fg0keXy3bcvvu1ekuSB/lN33LighAT4K1fggm8Y5iY0=; b=RgGDYWTpG4yQ/0CFujPe8yj3W/ M+flfHkozwkcb4zvPy4CD3VBotvZxWUXcBZqHT3HzR2v7nJ+nfpnXs/rPuWUOTxO7i/rwxCO3UN40 YA8RPB0aadoBohjVURNhFAsP7ydiV+sOBu8PrAPXFCPhWM9ZVkpnZC2WuRqyp0v8REvM=; Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mJSCv-0001Af-AV for control@debbugs.gnu.org; Fri, 27 Aug 2021 05:07:07 +0200 Date: Fri, 27 Aug 2021 05:07:01 +0200 Message-Id: <877dg7si0a.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #4179 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: tags 4179 + moreinfo quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) tags 4179 + moreinfo quit From unknown Sun Aug 17 22:06:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#4179: vc-merge with svn: syntax error in revision arg. Resent-From: "H. Dieter Wilhelm" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 27 Aug 2021 20:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 4179 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo To: Lars Ingebrigtsen Cc: Dan Nicolaescu , Dmitry Gutov , Stefan Monnier , 4179@debbugs.gnu.org Received: via spool by 4179-submit@debbugs.gnu.org id=B4179.1630095115639 (code B ref 4179); Fri, 27 Aug 2021 20:12:02 +0000 Received: (at 4179) by debbugs.gnu.org; 27 Aug 2021 20:11:55 +0000 Received: from localhost ([127.0.0.1]:53087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJiCg-0000AF-TK for submit@debbugs.gnu.org; Fri, 27 Aug 2021 16:11:55 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:35559) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJiCf-0000A0-HZ for 4179@debbugs.gnu.org; Fri, 27 Aug 2021 16:11:54 -0400 Received: from ping ([92.116.165.153]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MNtGq-1mdT2B1AXw-00ODc9; Fri, 27 Aug 2021 22:11:39 +0200 From: "H. Dieter Wilhelm" References: <87my5ycpj3.fsf@urmel.duenenhof-wilhelm.de> <200908200259.n7K2x8sj004573@godzilla.ics.uci.edu> <200908261804.n7QI4vh7023115@godzilla.ics.uci.edu> <878s0nsi0l.fsf@gnus.org> Date: Fri, 27 Aug 2021 22:11:37 +0200 In-Reply-To: <878s0nsi0l.fsf@gnus.org> (Lars Ingebrigtsen's message of "Fri, 27 Aug 2021 05:06:50 +0200") Message-ID: <86o89i641y.fsf@duenenhof-wilhelm.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K1:7pcqCR/kUZiThPXCaVmlTI9l36ZytaM5knGBBPY5cen4g/u6qMk 9qUH/wFPguxB1+Mu1b7NkWv1LWUhehy8dJ8xhwI/Pi02W/OlIoqr9usI6Nlgh3TYwilU76U sxIXj4p5rCFgHQnagOnoG7HPEAgFe6cL0yShg+UoAjTKw5VD3BhsTCsvSgh4IzdxFuEIfSP v1bQ2DNbWwhMf4HahIxJA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:/R+OIb6SPNc=:iBrMag5/VGEce8eUJ17OKm HynvZ6cH6ceH1QhVxQz30gYVJBjrJ34RFQOu4gH6czhZqIrNGnRswRzXMg3ccsD7hI3bkWjJs XPsCR1S11JIInl/iEy2JbXlThAEFn8VSFJTGZEOME+KnURynfBYwHgeYJGQUN0grnnMmdK7fF Zv7Bd0GZ4QFcZDG+YkB0yTk+fwcL2Ug49uBZ4zFmsh3U+AgZJvVmm4XAyP6lwtTon62n2AU6Q dRTbmvQshZNMocZgrhtK4rzYxHhgMAoVGDKlMsvpFbuPiiLkZwUapfGboI1Xz8ZkTCoxSQzgG BUzqKjLtkaId/ylLjmUVTbd7/mJSObtP5+WGcmVNGhRoz4xPIaQOlGvs/NjSL+CCtG+7JlKuL ijyEFuOrSTmbTSHMfI49GPEOXN8s+hyqVwQJc+bHXacCvqKkIhTVLTfliJRQiHpmUYoBwpAUr qjEMrJ1i+mV9r/y9ueigYBjVWBKez/xeP0wP2YzmA+HtKCikscnTmwshOxB5UiKge9RSeupJ7 hhhWSs8c0xIws9mPTLI6yyxwGhdGEEAjq1gnVIUqF7EWUtoBw7wk+P3odSpr43OsLjlwLPod4 42C05K3WSxEv30fZL+6BFtEbGbvgAf1a5MXOfiZg65lFZsezmo7rZZFKWPyXmRi4Joo29ngSS eTJIS0NHaj2NdSR0MhgtGBR4qKQ2fG0XDe77k0VdDP+lm/DYlq0ri9WsXauqwM2YFnRGszJR2 McsKSPsDMD+nWkYAmkNhf7GWragksMa0nbA4i9cZ8ipqGhhYP8VRveETb/Q= X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Lars Ingebrigtsen writes: > (I'm going through old bug reports that unfortunately weren't > resolved at the time.) > > This code has changed a lot in the 12 years since this was discussed -- > does anybody know whether the originally reported problem has been fixed > or not? Sorry, I can't tell, started that year with git (had to start...) and lost sight of the svn issue. Thank you for your detective work, though Dieter -- Best wishes H. Dieter Wilhelm Zwingenberg, Germany From unknown Sun Aug 17 22:06:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#4179: vc-merge with svn: syntax error in revision arg. Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 29 Aug 2021 00:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 4179 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo To: Lars Ingebrigtsen , Dan Nicolaescu Cc: Dieter Wilhelm , Stefan Monnier , 4179@debbugs.gnu.org Received: via spool by 4179-submit@debbugs.gnu.org id=B4179.163019821524301 (code B ref 4179); Sun, 29 Aug 2021 00:51:01 +0000 Received: (at 4179) by debbugs.gnu.org; 29 Aug 2021 00:50:15 +0000 Received: from localhost ([127.0.0.1]:55179 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mK91a-0006Jt-PU for submit@debbugs.gnu.org; Sat, 28 Aug 2021 20:50:15 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:36757) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mK91Y-0006JZ-IQ for 4179@debbugs.gnu.org; Sat, 28 Aug 2021 20:50:13 -0400 Received: by mail-wr1-f46.google.com with SMTP id q14so16625598wrp.3 for <4179@debbugs.gnu.org>; Sat, 28 Aug 2021 17:50:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=jGZO8r2AGGtY9OSWCwBLR5UrTmlssQvrwtdaIPDCmCw=; b=UEe5/akWFplqOyKxeFaYpWoqNwUWV6JBjX2Z+iU79k/AoT5eQ/hQDvEkzLXMdXkLX8 Rczhb4fxxWM02ZzMSjbGTi5krOMdBit73A7rhxMp2DYD6Vyiyhd64Z2GCvdGqr/2NToK setnTKQQrn4uQfyLYwxZSsqNpc1VpaGbUtcTIlcEoQvmYAwIns76RSR5F6vD6sbeRxjM YQym4EConmKDAOleOyO9OEAw++OU3SgKuKLMkvwQkee1Y+JRdpi0L7sJfscPMuA2c86I 2Skux68LHTWSjHrgl4tMWNmsGW4Ujw+1KkvxolOkBlKorRolEW7cZMDPfjdG9L/GURxU miYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=jGZO8r2AGGtY9OSWCwBLR5UrTmlssQvrwtdaIPDCmCw=; b=aYAw2MqzPUIORgiGVgrF5GLFASPyKdQ2Tn+mnfv6ZglkS6A2D+VxwieqbD76RVsGXN smh1hNNWHxLEuV7ledWOWbtC82kdCOP5tZtQqtMTNXfv7eHWHZAPwu850UlLKva7WCh7 Fv6FnWriPQk8E9iSLkv6oQEGgDyzsp61tpAv3t+eU4nLwDUK6G+xFnhJIW5GTMt9HLaC ZnnagwZ+yFa0iODhOfUH4nva9s+ma6KO3QPQUl7dxgwycQ/ovReieGvlJentV7WHr/K/ aU9wWlvVPmS+Fdj/M+zrcqd+gfrgkgQ9GZB4xZZopJQu/H/13kFmQl5h90IfSOu3ncwx 0Crw== X-Gm-Message-State: AOAM530V00kZiAppEpd7COaqYsL6BqJWdYekZIxlBC+TVwJx9oEPNvin vmHWEX+YW/an7ANA71DqG74= X-Google-Smtp-Source: ABdhPJwtuwScO197A/Kss9N2vOrN760agDpeVwuNxnh2KTtbiIdO7wAvDsIG0H2G7J4U4yUNgWAqtg== X-Received: by 2002:adf:bad4:: with SMTP id w20mr18286382wrg.100.1630198206680; Sat, 28 Aug 2021 17:50:06 -0700 (PDT) Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id z14sm2846106wmi.24.2021.08.28.17.50.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 28 Aug 2021 17:50:06 -0700 (PDT) References: <87my5ycpj3.fsf@urmel.duenenhof-wilhelm.de> <200908200259.n7K2x8sj004573@godzilla.ics.uci.edu> <200908261804.n7QI4vh7023115@godzilla.ics.uci.edu> <878s0nsi0l.fsf@gnus.org> From: Dmitry Gutov Message-ID: <7f7b777c-1ae1-8ca7-bc5c-80f19baba0e6@yandex.ru> Date: Sun, 29 Aug 2021 03:50:04 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <878s0nsi0l.fsf@gnus.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.4 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) On 27.08.2021 06:06, Lars Ingebrigtsen wrote: > Dan Nicolaescu writes: > >> We have this code in `vc-merge' >> >> (if (string= first-revision "") >> (setq status (vc-call-backend backend 'merge-news file)) >> (if (not (vc-find-backend-function backend 'merge)) >> (error "Sorry, merging is not implemented for %s" backend) >> (if (not (vc-branch-p first-revision)) >> (setq second-revision >> (read-string "Second revision: " >> (concat (vc-branch-part first-revision) "."))) >> ;; We want to merge an entire branch. Set revisions >> ;; accordingly, so that vc-BACKEND-merge understands us. >> (setq second-revision first-revision) >> ;; first-revision must be the starting point of the branch >> (setq first-revision (vc-branch-part first-revision))) >> >> `vc-branch-p' can be made VC backend specific. >> But what should we do with `vc-branch-part'? >> What should be the new structure of this code? > > (I'm going through old bug reports that unfortunately weren't > resolved at the time.) > > This code has changed a lot in the 12 years since this was discussed -- > does anybody know whether the originally reported problem has been fixed > or not? Hard for me to say: it's SVN. Someone who has easy access to such a server should try the original scenario. But there have indeed been some changes, including commit d17bae903902. Which mentions fixing "a layering violation that caused bad behavior with SVN". > Also: > > ;; functions that operate on RCS revision numbers. This code should > ;; also be moved into the backends. It stays for now, however, since > ;; it is used in code below. > (defun vc-branch-p (rev) > "Return t if REV is a branch revision." > (not (eq nil (string-match "\\`[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*\\'" rev)))) > > ;;;###autoload > (defun vc-branch-part (rev) > "Return the branch part of a revision number REV." > (let ((index (string-match "\\.[0-9]+\\'" rev))) > (when index > (substring rev 0 index)))) > > The comment there is wrong -- it's no longer used in vc.el. Perhaps > these two functions should be moved to vc-rcs.el (and renamed (with > obsolete aliases))? (They're only used in vc-rcs.el and vc-vcs.el.) Yes, they should. Also, vc-merge should call (vc-find-backend-function backend 'merge-file) instead of (vc-find-backend-function backend 'merge). They only seem equivalent for now by lucky accident. I'd do that change myself now, but it's similarly hard for me to quickly test any of the affected backends, and this operation is not covered by vc-tests.el. From unknown Sun Aug 17 22:06:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#4179: vc-merge with svn: syntax error in revision arg. Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 29 Aug 2021 20:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 4179 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo To: Dmitry Gutov Cc: Dieter Wilhelm , Dan Nicolaescu , Stefan Monnier , 4179@debbugs.gnu.org Received: via spool by 4179-submit@debbugs.gnu.org id=B4179.163026974611454 (code B ref 4179); Sun, 29 Aug 2021 20:43:02 +0000 Received: (at 4179) by debbugs.gnu.org; 29 Aug 2021 20:42:26 +0000 Received: from localhost ([127.0.0.1]:57554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKRdK-0002yg-1T for submit@debbugs.gnu.org; Sun, 29 Aug 2021 16:42:26 -0400 Received: from quimby.gnus.org ([95.216.78.240]:56326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKRdH-0002yO-JR for 4179@debbugs.gnu.org; Sun, 29 Aug 2021 16:42:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=xEgc8qrrXvupkSHBleFuzbkW4T4qs0rJU2wgg+o5qgI=; b=TyiSUzaJVTyFTyERPZDxHcnSVQ 8wq2YRBEhhX+J4Ap23wv4t5iiL+jLBsuVBaor17IgYyWmfxpcEN0FoEJLG+fNOfBpHdNgK6HFi7An BzUE+E+Fh48TxrCT9yDCcbvjyN/HXtdlajXgsT/cKClWyCPAH1GyfgHzh4U32Hut23VU=; Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mKRd5-0003pS-2D; Sun, 29 Aug 2021 22:42:15 +0200 From: Lars Ingebrigtsen References: <87my5ycpj3.fsf@urmel.duenenhof-wilhelm.de> <200908200259.n7K2x8sj004573@godzilla.ics.uci.edu> <200908261804.n7QI4vh7023115@godzilla.ics.uci.edu> <878s0nsi0l.fsf@gnus.org> <7f7b777c-1ae1-8ca7-bc5c-80f19baba0e6@yandex.ru> Date: Sun, 29 Aug 2021 22:42:10 +0200 In-Reply-To: <7f7b777c-1ae1-8ca7-bc5c-80f19baba0e6@yandex.ru> (Dmitry Gutov's message of "Sun, 29 Aug 2021 03:50:04 +0300") Message-ID: <87y28kaspp.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Dmitry Gutov writes: > Hard for me to say: it's SVN. Someone who has easy access to such a > server should try the original scenario. > > But there have indeed been some changes, including commit > d17bae903902. Which men [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Dmitry Gutov writes: > Hard for me to say: it's SVN. Someone who has easy access to such a > server should try the original scenario. > > But there have indeed been some changes, including commit > d17bae903902. Which mentions fixing "a layering violation that caused > bad behavior with SVN". OK; I think we can close this bug report, then. (Now done.) >> The comment there is wrong -- it's no longer used in vc.el. Perhaps >> these two functions should be moved to vc-rcs.el (and renamed (with >> obsolete aliases))? (They're only used in vc-rcs.el and vc-vcs.el.) > > Yes, they should. Also done. > Also, vc-merge should call (vc-find-backend-function > backend 'merge-file) instead of (vc-find-backend-function backend > 'merge). They only seem equivalent for now by lucky accident. I'd do > that change myself now, but it's similarly hard for me to quickly test > any of the affected backends, and this operation is not covered by > vc-tests.el. Perhaps open a new bug report for this and see whether anybody volunteers to implement and test? -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 29 16:42:45 2021 Received: (at control) by debbugs.gnu.org; 29 Aug 2021 20:42:45 +0000 Received: from localhost ([127.0.0.1]:57557 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKRdd-0002zA-9x for submit@debbugs.gnu.org; Sun, 29 Aug 2021 16:42:45 -0400 Received: from quimby.gnus.org ([95.216.78.240]:56344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKRdN-0002yX-H6 for control@debbugs.gnu.org; Sun, 29 Aug 2021 16:42:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=es2SLrz0456SKq2hWyB8LDlNdr65fxN+A0a/YIx8dsg=; b=bfYGE/IFiWYk7wLKFrbZl9ZxYd /Atgo6OZBHajb3P9YlfNkNxVCVQiP9Q2ewPeJQKzII/q+uO8uKe2kRWNEpPzEeqijQTZuoAEYSEV4 H7WaG60io9/BT3iT3coHB8743zhlKT1s00mbakVA3Y8tRCNMSchwEDlMxw4uDJp0rOSE=; Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mKRdF-0003pe-Gl for control@debbugs.gnu.org; Sun, 29 Aug 2021 22:42:23 +0200 Date: Sun, 29 Aug 2021 22:42:21 +0200 Message-Id: <87wno4aspe.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #4179 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: close 4179 quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) close 4179 quit From unknown Sun Aug 17 22:06:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#4179: vc-merge with svn: syntax error in revision arg. Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 29 Aug 2021 21:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 4179 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo To: Lars Ingebrigtsen Cc: Dieter Wilhelm , Dan Nicolaescu , Stefan Monnier , 4179@debbugs.gnu.org Received: via spool by 4179-submit@debbugs.gnu.org id=B4179.163027138922079 (code B ref 4179); Sun, 29 Aug 2021 21:10:02 +0000 Received: (at 4179) by debbugs.gnu.org; 29 Aug 2021 21:09:49 +0000 Received: from localhost ([127.0.0.1]:57570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKS3p-0005k3-13 for submit@debbugs.gnu.org; Sun, 29 Aug 2021 17:09:49 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:45571) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKS3n-0005jp-5T for 4179@debbugs.gnu.org; Sun, 29 Aug 2021 17:09:47 -0400 Received: by mail-wm1-f43.google.com with SMTP id j17-20020a05600c1c1100b002e754875260so8078416wms.4 for <4179@debbugs.gnu.org>; Sun, 29 Aug 2021 14:09:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=hCZjkhAVp0gjF3yw5oyifBPzjJ2fb06FftozBVGhSEg=; b=mb3j7Xst/IZfujYsWHoRqyeoecF4i1pan+H/MeXSoHZTeXyjDf7vzuvrfBLLHtV2Df pwecWMtKuRAw/6Yy6wx2aeNDFcfgo26T5JdthjisrxtsIxkekyh24wIVN2uvajX9i3y0 yzD5/ol9Ck6DT5O2Thx3WuTT4yoZRX7HQMhBkL/PFPXdCG6A6hfDLUQD0m7xg6B290zI uZMFygb6TwBwurldgmQarG79ZptX0h7DRk5gPayiO5yf8TTJBo3LFLtq1t6Ot834toNY OL+MvFwk5aMaCPsRmdttDNYFN3jJmWFR9yvQhjeYUzuOKZorbNwZedKBwdnD3MD45okl Sptw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=hCZjkhAVp0gjF3yw5oyifBPzjJ2fb06FftozBVGhSEg=; b=NeNTeF6eSRaeEjjo8JmRrdKJeJHtd1UiaevdiIED0OY6u6zeNRq/nRvEpOn2n8fA66 C7qA8qxUvgdkmWjWibtlqQq9wKzi7MqB0TS/cDM8ENax3jrfDMf9JR9kldWjUjfrjlFS srLMpdg8y7nqqlVBRGvbWytoc8FU7Rwt5oJ+MMDa4zz0Z6wk2itfqlt2Pi5PLLPb+B5Z 9Ih8ZaM8EpfYz9VA7VAZ/BdNmoAflcfa5Plh3VmwOOV0js+FiCEoiXBt3H+WKgNss75N SxWyyer/Pw3rWF0m3JhSl+RivRMeycT0r40jbRv4vijoqZJm3EuqzrN3nyFRS3P8tZdn Nmmg== X-Gm-Message-State: AOAM533fLQ2BGebNUUWB+PsgcjMFOYtJ4zQA8e519eHBY3kOzpNhwbht z7oKD876TYvripLl9QVND17Nxla+3CY= X-Google-Smtp-Source: ABdhPJzDIlImOnuLCIhD77wK8fHmOwTyLZDMmO0UnoGZeRYDn0b4ZESV6amv3Qm2hUZcix+DeZKMBg== X-Received: by 2002:a05:600c:4048:: with SMTP id j8mr3704313wmm.173.1630271381320; Sun, 29 Aug 2021 14:09:41 -0700 (PDT) Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id f17sm15455561wrt.63.2021.08.29.14.09.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 29 Aug 2021 14:09:40 -0700 (PDT) References: <87my5ycpj3.fsf@urmel.duenenhof-wilhelm.de> <200908200259.n7K2x8sj004573@godzilla.ics.uci.edu> <200908261804.n7QI4vh7023115@godzilla.ics.uci.edu> <878s0nsi0l.fsf@gnus.org> <7f7b777c-1ae1-8ca7-bc5c-80f19baba0e6@yandex.ru> <87y28kaspp.fsf@gnus.org> From: Dmitry Gutov Message-ID: <5a03bd09-5099-edc3-6c27-12bbaed5724f@yandex.ru> Date: Mon, 30 Aug 2021 00:09:39 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <87y28kaspp.fsf@gnus.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.4 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) On 29.08.2021 23:42, Lars Ingebrigtsen wrote: >> Also, vc-merge should call (vc-find-backend-function >> backend 'merge-file) instead of (vc-find-backend-function backend >> 'merge). They only seem equivalent for now by lucky accident. I'd do >> that change myself now, but it's similarly hard for me to quickly test >> any of the affected backends, and this operation is not covered by >> vc-tests.el. > Perhaps open a new bug report for this and see whether anybody > volunteers to implement and test? Filed bug#50258.