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

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Juri Linkov <juri <at> jurta.org>
Subject: bug#5302: closed (Fixed)
Date: Tue, 31 Jan 2017 08:06:02 +0000

[Message part 1 (text/plain, inline)]

Your bug report

#5302: Diff-mode fails on Bzr diffs

which was filed against the emacs package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 5302 <at> debbugs.gnu.org.

-- 
5302: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=5302
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Dima Kogan <dima <at> secretsauce.net>
To: 9597-done <at> debbugs.gnu.org, 5302-done <at> debbugs.gnu.org
Subject: Fixed
Date: Tue, 31 Jan 2017 00:05:05 -0800

I pushed the fix and a test in 47a1ebb8ab67c97904bf3211eb44ce2d7d40949d

[Message part 3 (message/rfc822, inline)]

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.