From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.bugs Subject: bug#12757: 24.2.50; vc-svn-merge-news: Couldn't analyze svn update result Date: Mon, 29 Oct 2012 09:43:50 +0100 Message-ID: References: <86fw4y576i.wl%%5253605f36527b613438407bc85287410830e04c@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1351500285 7706 80.91.229.3 (29 Oct 2012 08:44:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 29 Oct 2012 08:44:45 +0000 (UTC) Cc: 12757@debbugs.gnu.org To: OKAZAKI Tetsurou Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Oct 29 09:44:53 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TSkxp-0005Ry-3r for geb-bug-gnu-emacs@m.gmane.org; Mon, 29 Oct 2012 09:44:53 +0100 Original-Received: from localhost ([::1]:45979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSkxg-00026o-Oe for geb-bug-gnu-emacs@m.gmane.org; Mon, 29 Oct 2012 04:44:44 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:59978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSkxd-00026g-Qh for bug-gnu-emacs@gnu.org; Mon, 29 Oct 2012 04:44:43 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TSkxZ-0002cj-RN for bug-gnu-emacs@gnu.org; Mon, 29 Oct 2012 04:44:41 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:55350) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSkxZ-0002bs-O4 for bug-gnu-emacs@gnu.org; Mon, 29 Oct 2012 04:44:37 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1TSkzu-0000G9-0m for bug-gnu-emacs@gnu.org; Mon, 29 Oct 2012 04:47:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Andreas Schwab Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 29 Oct 2012 08:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12757 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 12757-submit@debbugs.gnu.org id=B12757.1351500381934 (code B ref 12757); Mon, 29 Oct 2012 08:47:01 +0000 Original-Received: (at 12757) by debbugs.gnu.org; 29 Oct 2012 08:46:21 +0000 Original-Received: from localhost ([127.0.0.1]:37365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TSkzF-0000F1-B4 for submit@debbugs.gnu.org; Mon, 29 Oct 2012 04:46:21 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.10]:35511) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TSkzC-0000Et-JW for 12757@debbugs.gnu.org; Mon, 29 Oct 2012 04:46:20 -0400 Original-Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3Xqq945rKlz3hhcs; Mon, 29 Oct 2012 09:43:51 +0100 (CET) X-Auth-Info: q+FbseD2o0ULuz5i9+gdvIsYs+7Z2LE4AuukHz+U4Vk= Original-Received: from igel.home (ppp-88-217-107-89.dynamic.mnet-online.de [88.217.107.89]) by mail.mnet-online.de (Postfix) with ESMTPA id 3Xqq935ZHdzbbhm; Mon, 29 Oct 2012 09:43:51 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id 48253CA2A1; Mon, 29 Oct 2012 09:43:50 +0100 (CET) X-Yow: Hiccuping & trembling into the WASTE DUMPS of New Jersey like some drunken CABBAGE PATCH DOLL, coughing in line at FIORUCCI'S!! In-Reply-To: <86fw4y576i.wl%%5253605f36527b613438407bc85287410830e04c@gmail.com> (OKAZAKI Tetsurou's message of "Mon, 29 Oct 2012 11:43:49 +0900") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:66173 Archived-At: OKAZAKI Tetsurou writes: > === modified file 'lisp/vc/vc-svn.el' > *** lisp/vc/vc-svn.el 2012-02-25 04:29:09 +0000 > --- lisp/vc/vc-svn.el 2012-10-29 00:12:43 +0000 > *************** > *** 399,405 **** > ;; We also used to match the filename in column 0 without any > ;; meta-info before it, but I believe this can never happen. > (concat "^\\(\\([ACGDU]\\)\\(.[B ]\\)? \\)" > ! (regexp-quote (file-name-nondirectory file))) > nil t) > (cond > ;; Merge successful, we are in sync with repository now > --- 399,405 ---- > ;; We also used to match the filename in column 0 without any > ;; meta-info before it, but I believe this can never happen. > (concat "^\\(\\([ACGDU]\\)\\(.[B ]\\)? \\)" > ! (regexp-quote (file-relative-name file))) Is that backward compatible with older svn versions? Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."