From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#5302: Diff-mode fails on Bzr diffs Date: Mon, 04 Jan 2010 19:29:36 +0200 Organization: JURTA Message-ID: <871vi6wxhz.fsf@mail.jurta.org> Reply-To: Juri Linkov , 5302@debbugs.gnu.org NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1262629293 15572 80.91.229.12 (4 Jan 2010 18:21:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 4 Jan 2010 18:21:33 +0000 (UTC) To: bug-gnu-emacs@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Jan 04 19:21:26 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NRrYK-0007rS-Lm for geb-bug-gnu-emacs@m.gmane.org; Mon, 04 Jan 2010 19:21:17 +0100 Original-Received: from localhost ([127.0.0.1]:40589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRrD2-0001Ax-Hw for geb-bug-gnu-emacs@m.gmane.org; Mon, 04 Jan 2010 12:59:16 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRr4D-00079D-Sd for bug-gnu-emacs@gnu.org; Mon, 04 Jan 2010 12:50:09 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRr48-00076Q-2Q for bug-gnu-emacs@gnu.org; Mon, 04 Jan 2010 12:50:08 -0500 Original-Received: from [199.232.76.173] (port=34683 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRr47-00075u-Jn for bug-gnu-emacs@gnu.org; Mon, 04 Jan 2010 12:50:03 -0500 Original-Received: from mx20.gnu.org ([199.232.41.8]:51679) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NRr44-0003Co-1q for bug-gnu-emacs@gnu.org; Mon, 04 Jan 2010 12:50:02 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRr2u-0005rI-5G for bug-gnu-emacs@gnu.org; Mon, 04 Jan 2010 12:48:48 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1NRqli-000329-EQ; Mon, 04 Jan 2010 12:31:02 -0500 X-Loop: bug-gnu-emacs@gnu.org Mail-Followup-To: Juri Linkov , 5302@debbugs.gnu.org Resent-From: Juri Linkov Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 04 Jan 2010 17:31:02 +0000 Resent-Message-ID: Resent-Sender: bug-gnu-emacs@gnu.org X-Emacs-PR-Message: report 5302 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@debbugs.gnu.org id=B.126262625311652 (code B ref -1); Mon, 04 Jan 2010 17:31:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 4 Jan 2010 17:30:53 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NRqlY-00031m-Mw for submit@debbugs.gnu.org; Mon, 04 Jan 2010 12:30:53 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NRqlS-00031X-Gb for submit@debbugs.gnu.org; Mon, 04 Jan 2010 12:30:46 -0500 Original-Received: from mail.gnu.org ([199.232.76.166]:42076 helo=mx10.gnu.org) by fencepost.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NRqlN-0006Xa-Dg for submit@debbugs.gnu.org; Mon, 04 Jan 2010 12:30:42 -0500 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NRqlI-0006yE-M5 for submit@debbugs.gnu.org; Mon, 04 Jan 2010 12:30:38 -0500 Original-Received: from lists.gnu.org ([199.232.76.165]:44137) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRqlI-0006xx-E5 for submit@debbugs.gnu.org; Mon, 04 Jan 2010 12:30:36 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRqlI-0006d2-4G for bug-gnu-emacs@gnu.org; Mon, 04 Jan 2010 12:30:36 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRqlD-0006aS-CF for bug-gnu-emacs@gnu.org; Mon, 04 Jan 2010 12:30:35 -0500 Original-Received: from [199.232.76.173] (port=56072 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRqlD-0006aN-6X for bug-gnu-emacs@gnu.org; Mon, 04 Jan 2010 12:30:31 -0500 Original-Received: from smtp-out4.starman.ee ([85.253.0.6]:33657 helo=mx2.starman.ee) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRqlC-0006tF-D2 for bug-gnu-emacs@gnu.org; Mon, 04 Jan 2010 12:30:31 -0500 X-Virus-Scanned: by Amavisd-New at mx2.starman.ee Original-Received: from mail.starman.ee (82.131.96.163.cable.starman.ee [82.131.96.163]) by mx2.starman.ee (Postfix) with ESMTP id 185473F40AF for ; Mon, 4 Jan 2010 19:30:14 +0200 (EET) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (x86_64-pc-linux-gnu) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Spam-Score: -4.7 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list X-Spam-Score: -4.9 (----) Resent-Date: Mon, 04 Jan 2010 12:31:02 -0500 X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:33924 Archived-At: With the Bzr output in Diff-mode, `C-c C-c' (`diff-goto-source') signals the following error: Debugger entered--Lisp error: (error "End of hunk ambiguously marked") signal(error ("End of hunk ambiguously marked")) error("End of hunk ambiguously marked") diff-sanity-check-hunk() diff-find-source-location(nil t) diff-goto-source(nil 3) call-interactively(diff-goto-source nil nil) Steps to reproduce: 1. emacs -Q 2. In a Bzr controlled dir, run: M-! bzr log -p -r-2.. RET 3. Switch to the output buffer, and type: M-x diff-mode RET 4. Go to the last hunk of the first revision and type `C-c C-c'. The problem is that Brz separates revisions with a line of dashes like ------------------------------------------------------------ that Diff-mode doesn't understand. -- Juri Linkov http://www.jurta.org/emacs/