[debbugs-tracker] bug#5302: closed (Diff-mode fails on Bzr diffs)

[GNU bug Tracking System]

Your message dated Tue, 31 Jan 2017 00:05:05 -0800
with message-id <address@hidden>
and subject line Fixed
has caused the debbugs.gnu.org bug report #5302,
regarding Diff-mode fails on Bzr diffs
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
5302: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=5302
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> Diff-mode fails on Bzr diffs
>
>
>
>
> Date: 
>
> Mon, 04 Jan 2010 19:29:36 +0200
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (x86_64-pc-linux-gnu)
>
>
>
>
> 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/
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Fixed
>
>
>
>
> Date: 
>
> Tue, 31 Jan 2017 00:05:05 -0800
>
>
>
>
> User-agent: 
>
> mu4e 0.9.19; emacs 26.0.50.1
>
>
>
>
> I pushed the fix and a test in 47a1ebb8ab67c97904bf3211eb44ce2d7d40949d
>
>
> --- End Message ---