From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: OKAZAKI Tetsurou 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 11:43:49 +0900 Message-ID: <86fw4y576i.wl%%5253605f36527b613438407bc85287410830e04c@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.7 - "Harue") Content-Type: multipart/mixed; boundary="Multipart_Mon_Oct_29_11:43:49_2012-1" X-Trace: ger.gmane.org 1351478683 20382 80.91.229.3 (29 Oct 2012 02:44:43 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 29 Oct 2012 02:44:43 +0000 (UTC) To: 12757@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Oct 29 03:44:52 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 1TSfLQ-0002eO-29 for geb-bug-gnu-emacs@m.gmane.org; Mon, 29 Oct 2012 03:44:52 +0100 Original-Received: from localhost ([::1]:45261 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSfLH-0008QQ-Vq for geb-bug-gnu-emacs@m.gmane.org; Sun, 28 Oct 2012 22:44:43 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:45667) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSfLE-0008QC-HW for bug-gnu-emacs@gnu.org; Sun, 28 Oct 2012 22:44:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TSfLD-0003JP-DD for bug-gnu-emacs@gnu.org; Sun, 28 Oct 2012 22:44:40 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:55132) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSfLD-0003JH-9i for bug-gnu-emacs@gnu.org; Sun, 28 Oct 2012 22:44:39 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1TSfNW-0000Eg-43 for bug-gnu-emacs@gnu.org; Sun, 28 Oct 2012 22:47:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: OKAZAKI Tetsurou Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 29 Oct 2012 02:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 12757 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.1351478799876 (code B ref -1); Mon, 29 Oct 2012 02:47:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 29 Oct 2012 02:46:39 +0000 Original-Received: from localhost ([127.0.0.1]:37150 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TSfN8-0000E4-P4 for submit@debbugs.gnu.org; Sun, 28 Oct 2012 22:46:39 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:56187) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TSfN5-0000Dv-Nx for submit@debbugs.gnu.org; Sun, 28 Oct 2012 22:46:36 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TSfKl-00038y-4s for submit@debbugs.gnu.org; Sun, 28 Oct 2012 22:44:12 -0400 Original-Received: from lists.gnu.org ([208.118.235.17]:54790) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSfKl-00038u-28 for submit@debbugs.gnu.org; Sun, 28 Oct 2012 22:44:11 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:45550) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSfKk-0008Nn-1Z for bug-gnu-emacs@gnu.org; Sun, 28 Oct 2012 22:44:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TSfKj-00036E-0V for bug-gnu-emacs@gnu.org; Sun, 28 Oct 2012 22:44:09 -0400 Original-Received: from mail-pa0-f41.google.com ([209.85.220.41]:63703) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSfKi-00034E-Qn for bug-gnu-emacs@gnu.org; Sun, 28 Oct 2012 22:44:08 -0400 Original-Received: by mail-pa0-f41.google.com with SMTP id fa10so3159779pad.0 for ; Sun, 28 Oct 2012 19:44:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:message-id:from:to:subject:user-agent:mime-version :content-type; bh=oKEBAssyJOQkc5xRXKW8vla816sjQ2UrnGaVq8/rx6s=; b=Q5wXWbGrCHtuk65F6MZEStUWVrNthiXPLecMoo1rE9NhKl+rYxt5R7qHCq4vTWbYlG t2XBJf92D33H0/hrYGhHmvXglls6IJ0qjdPqpdWzxUye+V5sBdLAYTeRSAcGVHfAf/LH eg1maCWEe5AleONqJdGv2eSpY7BRnFWYKMJzOAkdzjaR5TpYdQqqld9TFfk1CIwt3z4S qtyGWYaYcMgrrLU/jnIbW3rD2RIiMQMR7J5bsLBcMULuOgeE/N/A1SwjKzNwsaRyQezB UnR3PUmJrE2Wu5464vn2hZrq6U+gprve27jAF70XyE4aAtq1Oqf9tzPen1u+guA3dZdO +Z4Q== Original-Received: by 10.68.218.10 with SMTP id pc10mr87821251pbc.47.1351478647567; Sun, 28 Oct 2012 19:44:07 -0700 (PDT) Original-Received: from zeroset.gmail.com (nttkyo213143.tkyo.nt.ftth.ppp.infoweb.ne.jp. [220.146.172.143]) by mx.google.com with ESMTPS id pf4sm5169497pbc.38.2012.10.28.19.44.05 (version=SSLv3 cipher=OTHER); Sun, 28 Oct 2012 19:44:06 -0700 (PDT) User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/24.2 Mule/6.0 (HANACHIRUSATO) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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:66163 Archived-At: --Multipart_Mon_Oct_29_11:43:49_2012-1 Content-Type: text/plain; charset=US-ASCII Tags: patch In GNU Emacs 24.2.50.5 (i686-pc-cygwin) of 2012-10-29 on zeroset Bzr revision: 110709 monnier@iro.umontreal.ca-20121028204149-1s63clufiecqd05k Windowing system distributor `Microsoft Corp.', version 0.0.0 Configured using: `configure '--without-all' '--without-x' '--with-w32' '--with-gnutls' '--with-xml2' '--with-xpm' '--with-jpeg' '--with-tiff' '--with-gif' '--with-png' '--with-rsvg' '--enable-check-lisp-object-type' 'CFLAGS=-ggdb3 -O2'' with svn, version 1.7.7 (r1393599) compiled Oct 10 2012, 10:19:48 VC back-end for SVN fails to parse the merge response when the target file is in the subdirectory. In *vc-dir* buffer: VC backend : SVN Working dir: ~/Checkout/googlecode.com/zxing-read-only/ Repository : http://zxing.googlecode.com/svn needs-merge core/src/com/google/zxing/MultiFormatReader.java error "Couldn't analyze svn update result" occurs by pressing `+' on the `needs-merge' line. corresponding messages: Merging changes into /home/foo/Checkout/googlecode.com/zxing-read-only/core/src/com/google/zxing/MultiFormatReader.java... vc-svn-merge-news: Couldn't analyze svn update result *vc* buffer is as follows: Updating 'core/src/com/google/zxing/MultiFormatReader.java': G core/src/com/google/zxing/MultiFormatReader.java Updated to revision 2482. --Multipart_Mon_Oct_29_11:43:49_2012-1 Content-Type: application/octet-stream; type=patch Content-Disposition: attachment; filename="vc-svn-merge-news.diff" Content-Transfer-Encoding: 7bit === 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))) nil t) (cond ;; Merge successful, we are in sync with repository now --Multipart_Mon_Oct_29_11:43:49_2012-1--