GNU bug report logs - #9597
23.3; [diff-mode] Can't quite cope with git patches

Previous Next

Package: emacs;

Reported by: Dave Abrahams <dave <at> boostpro.com>

Date: Sun, 25 Sep 2011 02:01:01 UTC

Severity: normal

Found in version 23.3

Done: Dima Kogan <dima <at> secretsauce.net>

Bug is archived. No further changes may be made.

Full log

View this message in rfc822 format

From: Dima Kogan <dima <at> secretsauce.net>
To: Tino Calancha <tino.calancha <at> gmail.com>
Cc: 5302 <at> debbugs.gnu.org, 9597 <at> debbugs.gnu.org, Eli Zaretskii <eliz <at> gnu.org>
Subject: bug#9597: bug#5302: Diff-mode fails on Bzr diffs
Date: Tue, 31 Jan 2017 08:52:32 -0800

On January 31, 2017 1:35:34 AM PST, Tino Calancha <tino.calancha <at> gmail.com> wrote:
>
>
>On Tue, 31 Jan 2017, Tino Calancha wrote:
>
>>
>> Dima Kogan <dima <at> secretsauce.net> writes:
>>
>>> I pushed the fix and a test in
>47a1ebb8ab67c97904bf3211eb44ce2d7d40949d
>> Hi Dima,
>> i just pulled the master branch but i cannot find
>> such 47a1ebb commit.
>> $ grep diff-separator-re diff-mode.el
>> returns 1
>>
>> Apparently the fix is not there.
>Also your latest commit f3c77d11af65f3b319b1784b4c3cf08c51aa7997
>looks wrong: it changes 5 files with >100 lines changed, 
>but the commit message is just one word: stash

I made a mistake and ended up pushing the wrong few commits. The revert and the correct commits are pushed now. The fix lives in 189df8262e54c4. The test lives in 3506ec2b11.
This bug report was last modified 8 years and 113 days ago.

Previous Next

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