GNU bug report logs - #5302
Diff-mode fails on Bzr diffs

Previous Next

Full log

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Juri Linkov <juri <at> jurta.org>
To: bug-gnu-emacs <at> gnu.org
Subject: Diff-mode fails on Bzr diffs
Date: Mon, 04 Jan 2010 19:29:36 +0200

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/

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.