From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#9597: bug#5302: Diff-mode fails on Bzr diffs Date: Wed, 1 Feb 2017 01:55:16 +0900 Message-ID: References: <877f5bwqjz.fsf@calancha-pc> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: blaine.gmane.org 1485884298 30377 195.159.176.226 (31 Jan 2017 17:38:18 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 31 Jan 2017 17:38:18 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 Cc: 5302@debbugs.gnu.org, 9597@debbugs.gnu.org To: Dima Kogan Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jan 31 18:38:14 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYcNh-0007gg-Nq for geb-bug-gnu-emacs@m.gmane.org; Tue, 31 Jan 2017 18:38:13 +0100 Original-Received: from localhost ([::1]:39756 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cYcNn-0005Wl-5p for geb-bug-gnu-emacs@m.gmane.org; Tue, 31 Jan 2017 12:38:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cYbix-0007KC-Sn for bug-gnu-emacs@gnu.org; Tue, 31 Jan 2017 11:56:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cYbit-0003JI-6m for bug-gnu-emacs@gnu.org; Tue, 31 Jan 2017 11:56:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:54277) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cYbit-0003JD-3j for bug-gnu-emacs@gnu.org; Tue, 31 Jan 2017 11:56:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cYbis-0001Qb-TI for bug-gnu-emacs@gnu.org; Tue, 31 Jan 2017 11:56:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 31 Jan 2017 16:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9597 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 9597-submit@debbugs.gnu.org id=B9597.14858817275431 (code B ref 9597); Tue, 31 Jan 2017 16:56:02 +0000 Original-Received: (at 9597) by debbugs.gnu.org; 31 Jan 2017 16:55:27 +0000 Original-Received: from localhost ([127.0.0.1]:52472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYbiI-0001PW-Oi for submit@debbugs.gnu.org; Tue, 31 Jan 2017 11:55:26 -0500 Original-Received: from mail-pf0-f193.google.com ([209.85.192.193]:34966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYbiH-0001PG-7U; Tue, 31 Jan 2017 11:55:25 -0500 Original-Received: by mail-pf0-f193.google.com with SMTP id f144so28734302pfa.2; Tue, 31 Jan 2017 08:55:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=4akcky3dw/XzttlBexYMBpNGmTEhUcDxL/RuGTufJKw=; b=MUaiUnuvOD4eqxGS6V+hWT1Iiyok5qIYtGG5D1nMAwFtqRB344jGQTo7vozp/UfTpN ieeMd1p4XoN/1i1rdG9spFWNMa7UTBt4S+8LuXZr895IIZiJGXpEYuyUwmISfyCbemLI j0Z+WofvVU1dJRwiwrs8CZx2oY4+1TfNf3InxSYx4BYKepSSXm5pIyZdtdF2lMRKCMk+ K7owBGb3M9zXKM0ycTyWLZJ07I16jnCQHU1rHsPkQ6m+SiMzi89ZUg62Qa3+C/ocQtq6 Ht9M4djrMWELxlFFc58XhUCb8UQV1Phbhl4CI1oSnRouBFvLkTCCPfaoSuqVLP6PtLD4 huHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=4akcky3dw/XzttlBexYMBpNGmTEhUcDxL/RuGTufJKw=; b=g2b2Z3H2INCqyIti2CNDvprcO46JJW6V5br0IxZGPkkv7owT3zSbBXHvi3/DECS/8r SmwWfr/QCXcVUuuC0pC+MmC10brwsJu5ljzrIGUtI3V2YGjT0DcSN1vqYLOHNqPu/glk FlEZDcIgPXC1EX/Y+FZWgZ/L6GlL8WqqSVLoeGetiMx2QFY2/qfDPx9Z83Uc6bYGpHuU 4nuOlAEwMMqsz8Srzb1+5FxNyUEnb52up0LJzD9HxJr2v5GtiUmZe5lp+1nNySMdXSIH MffwKa+HmFIJf3wicrG9y8zITqV17pwCrKN8wS8xukHEo9bF9nxKSNk/ggJHdlmKkhzS Jm7A== X-Gm-Message-State: AIkVDXIpe7pr51SGet1xEqB5/ODgak4LnpVAO9YMxO5gOOGWat7OYwlsDW/XgvgPBfYSSA== X-Received: by 10.98.80.146 with SMTP id g18mr30632058pfj.74.1485881719353; Tue, 31 Jan 2017 08:55:19 -0800 (PST) Original-Received: from [192.168.0.18] (104.81.147.124.dy.bbexcite.jp. [124.147.81.104]) by smtp.gmail.com with ESMTPSA id e25sm42555387pfk.3.2017.01.31.08.55.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jan 2017 08:55:18 -0800 (PST) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:128838 Archived-At: On 02/01/2017 01:52 AM, Dima Kogan wrote: > On January 31, 2017 1:35:34 AM PST, Tino Calancha wrote: >> >> On Tue, 31 Jan 2017, Tino Calancha wrote: >> >>> Dima Kogan 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. > I see your new commits now. Thank you very much for fixing this bugs.