From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 04 12:30:53 2010 Received: (at submit) by debbugs.gnu.org; 4 Jan 2010 17:30:53 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NRqlY-00031m-Mw for submit@debbugs.gnu.org; Mon, 04 Jan 2010 12:30:53 -0500 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NRqlS-00031X-Gb for submit@debbugs.gnu.org; Mon, 04 Jan 2010 12:30:46 -0500 Received: from mail.gnu.org ([199.232.76.166]:42076 helo=mx10.gnu.org) by fencepost.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NRqlN-0006Xa-Dg for submit@debbugs.gnu.org; Mon, 04 Jan 2010 12:30:42 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NRqlI-0006yE-M5 for submit@debbugs.gnu.org; Mon, 04 Jan 2010 12:30:38 -0500 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on monty-python X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00, FORGED_RCVD_HELO,UNPARSEABLE_RELAY autolearn=ham version=3.1.0 Received: from lists.gnu.org ([199.232.76.165]:44137) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRqlI-0006xx-E5 for submit@debbugs.gnu.org; Mon, 04 Jan 2010 12:30:36 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRqlI-0006d2-4G for bug-gnu-emacs@gnu.org; Mon, 04 Jan 2010 12:30:36 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRqlD-0006aS-CF for bug-gnu-emacs@gnu.org; Mon, 04 Jan 2010 12:30:35 -0500 Received: from [199.232.76.173] (port=56072 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRqlD-0006aN-6X for bug-gnu-emacs@gnu.org; Mon, 04 Jan 2010 12:30:31 -0500 Received: from smtp-out4.starman.ee ([85.253.0.6]:33657 helo=mx2.starman.ee) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRqlC-0006tF-D2 for bug-gnu-emacs@gnu.org; Mon, 04 Jan 2010 12:30:31 -0500 X-Virus-Scanned: by Amavisd-New at mx2.starman.ee Received: from mail.starman.ee (82.131.96.163.cable.starman.ee [82.131.96.163]) by mx2.starman.ee (Postfix) with ESMTP id 185473F40AF for ; Mon, 4 Jan 2010 19:30:14 +0200 (EET) From: Juri Linkov To: bug-gnu-emacs@gnu.org Subject: Diff-mode fails on Bzr diffs Organization: JURTA Date: Mon, 04 Jan 2010 19:29:36 +0200 Message-ID: <871vi6wxhz.fsf@mail.jurta.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Spam-Score: -4.7 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -4.9 (----) 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/ From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 31 03:05:11 2017 Received: (at 5302-done) by debbugs.gnu.org; 31 Jan 2017 08:05:11 +0000 Received: from localhost ([127.0.0.1]:51684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYTR9-0002Ib-61 for submit@debbugs.gnu.org; Tue, 31 Jan 2017 03:05:11 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:39973) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYTR7-0002IQ-CD; Tue, 31 Jan 2017 03:05:09 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id E23CA20AD8; Tue, 31 Jan 2017 03:05:08 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 31 Jan 2017 03:05:08 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=secretsauce.net; h=content-type:date:from:message-id:mime-version:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=fqN uDnknuD4MTNUxbuHd1m7eHBY=; b=l2QfK3jyOpSTnauUsrxUVlITgBv1o8FlshC 4AOV3s+5YM8561xyg+GKlBYruKl1eKIuIoW08vG9F/dIRdYazVH6YOk/J65AIuaT fQxjJGOLJxMFbnz37sSBJruqFLrSrxPDc7o9LaIjU3NSF+p4BZxQR5jcgxiRsfSb pmzFegn8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=smtpout; bh=fqNuDnknuD4MTNUxbuHd1m7eHBY=; b=QIMlP GqoUZ6Gs7F6t6zPtzK1LB4+phfgNwyjUy6EWGmKGy6QIlE/Pb62eRUBpmVIgA5Po HnSeE+Okti8B6qy4qoU6/vKgGq2EPc4Q4HNT1giISTSY/s+e6Zj/UfvRX8FvF7q3 6ya1k4Xv1M8gZkn06CqNPGFBPLjL8pwq4oVMlg= X-ME-Sender: X-Sasl-enc: bvOb55XirsuLLIleXoW3LgoV25BlplZ2SkU7NKeEWBta 1485849908 Received: from scrawny (50-1-153-216.dsl.dynamic.fusionbroadband.com [50.1.153.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 9293B2450F; Tue, 31 Jan 2017 03:05:08 -0500 (EST) Received: from dima by scrawny with local (Exim 4.88) (envelope-from ) id 1cYTR3-0005Ab-MK; Tue, 31 Jan 2017 00:05:05 -0800 User-agent: mu4e 0.9.19; emacs 26.0.50.1 From: Dima Kogan To: 9597-done@debbugs.gnu.org, 5302-done@debbugs.gnu.org Subject: Fixed Date: Tue, 31 Jan 2017 00:05:05 -0800 Message-ID: <87zii7vemm.fsf@secretsauce.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 5302-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) I pushed the fix and a test in 47a1ebb8ab67c97904bf3211eb44ce2d7d40949d From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 31 04:02:23 2017 Received: (at 5302) by debbugs.gnu.org; 31 Jan 2017 09:02:23 +0000 Received: from localhost ([127.0.0.1]:51713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYUKV-0003eQ-Ei for submit@debbugs.gnu.org; Tue, 31 Jan 2017 04:02:23 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:32920) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYUKS-0003e7-Fu; Tue, 31 Jan 2017 04:02:22 -0500 Received: by mail-pf0-f196.google.com with SMTP id e4so26765651pfg.0; Tue, 31 Jan 2017 01:02:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version; bh=P7I6HPTHjlpK5B6nLe6nVnSSRv5GD+22TbB8LqZuUts=; b=S15rQrl+aR9qt11TQE7gKKmcjw1FB5qr/l3JLDZhJvSET8Lt7MU9JnuRYBXYvKoRJo J11EVOUIZ2huWRCE7XqmZAzz8aRV+1zhkj7WXy9FKlW1iRxELzn1zDU4GV1b78zrznnR k4GyR9zDfDGgjBD1r5YkQvx+NuaWSi2klVfoGnurNrOlnj0eW6chDLSk/GD7Zs9cLzRh FXrxiZS464GYWctZfEF7eSUDYIuh6PI3Ongh1qBl6nQ1J49oStM90TWDQ33VSlLeQwk5 o3rfXjCD1JBHW392cumJEoHGBrP7RapRQwarzm48wBobm0v4dutinNHbZKYPKJYv8a3y phcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version; bh=P7I6HPTHjlpK5B6nLe6nVnSSRv5GD+22TbB8LqZuUts=; b=C7adxAo3Zg3U5F6wzSfqZUhcPOxfN7R4+U2RzovjYlopRVJFm1fBvsM8/mfLzbs61Z ckeFfubmdUwBkg6/lk2o6nDYkd7ypYwprc1vXen8RYQc4D+8irEl3Z5syfWtokyzaETZ MzhTtd2Uo7lRlEV6kwdavPxCzU3gPKPLZKl7JlYutrxW9vLsOsww9zbUBGExxIjOfCNm 30S1rWwSOAS6p0pkZ6YCU68g/9ReTcQab/+iEu+j46urDWvj/CYAN8oF49FDEvhmrCI9 HHzswAle6KGZl+ZAk4mNUaCqeKu6uloBQD1uRsrhw6HSnbqCpnLB8FZk4MFmQm4YOEzj mwIQ== X-Gm-Message-State: AIkVDXIoch93vQuQGlKsI6wvAvsQySq7AeTLY7iCMjdl5fDz7R3Q4O14yCcaAHVO3AY7RA== X-Received: by 10.98.223.195 with SMTP id d64mr28061369pfl.80.1485853334579; Tue, 31 Jan 2017 01:02:14 -0800 (PST) Received: from calancha-pc ([103.5.140.175]) by smtp.gmail.com with ESMTPSA id w2sm38800839pfi.65.2017.01.31.01.02.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Jan 2017 01:02:14 -0800 (PST) From: Tino Calancha To: Dima Kogan Subject: Re: bug#5302: Diff-mode fails on Bzr diffs Date: Tue, 31 Jan 2017 18:02:08 +0900 Message-ID: <877f5bwqjz.fsf@calancha-pc> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: 5302 Cc: 5302@debbugs.gnu.org, 9597@debbugs.gnu.org, tino.calancha@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) 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. From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 31 04:36:16 2017 Received: (at 5302) by debbugs.gnu.org; 31 Jan 2017 09:36:16 +0000 Received: from localhost ([127.0.0.1]:51723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYUrI-0004RG-8u for submit@debbugs.gnu.org; Tue, 31 Jan 2017 04:36:16 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36101) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYUrG-0004R0-QP; Tue, 31 Jan 2017 04:36:15 -0500 Received: by mail-pf0-f196.google.com with SMTP id 19so26935072pfo.3; Tue, 31 Jan 2017 01:36:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=K2LfeGDLnWC67LWLHDb7xfCVIrVg142ZQQwH4xnuOaI=; b=mA1BCFscEzWyySUNzbSxWfswl9OMHEugyb1yzfPT1U10MX4ch0PFb+qkBV1thPjnpj odjva3ho71i1/tHRCGp/ijqT5CTbxldQ27qTkKmqXDnM9PRT+sYlSKkz3Gg/sb9L+HeX dktX5w7Jda9O/UlDEPTgsGgRWl0KdczncAnyDAaCTGUFCUgUgGkbnz4py9caJprzobh1 oq+6k1HCOaL37d6DDrjDn8qliCvOa5D3XdbLxx9D8rbEbVnxSbPFAkFTeKvTZEJ4GeOG 51CnqBBxQbTjfZVxsapnKem2QcgKdWqSZYjciYT/T0biHhmHgfEYX0pg3cH6k56XCRHZ JfPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=K2LfeGDLnWC67LWLHDb7xfCVIrVg142ZQQwH4xnuOaI=; b=OzEbJm3i5bPH+nBcvv1d+/Z2ArRNnyNYxp945GSVthrgpIurZPWTcvyP/OMOAFdfjb 3yccvosF8uoj8TG7s1QOq7A8MOGTwbYuBs1uCfw/1+heYzBLigpZ3tgxCpcjuV1PMK76 eDVl6QTF13bvCt06gKNcYhzwn/jhAjltkjYdgjpUu9oMkSfOQmuH4/gVJ3l/ABXHvDZU Duf40wWwGRSc0yugb05lp8et66tyR3zxcjNPWE7Kb+XdGe3ienK4OfhfopuA/AnDvt4Z qUj8swP1w4oI3t9d9o5aGa/5VCh+QFGn5TmtlVce80xPXxMHHPzLuqMLl+Ohr89J790r 6YHQ== X-Gm-Message-State: AIkVDXL5AUqxK7wiwSdnKLDjLTX2Z1Z6OGKknQUAv3Ni9xUgi2aAA/avt93g1FrmzD7lMQ== X-Received: by 10.99.36.3 with SMTP id k3mr29565660pgk.136.1485855369272; Tue, 31 Jan 2017 01:36:09 -0800 (PST) Received: from calancha-pc ([103.5.140.137]) by smtp.gmail.com with ESMTPSA id i21sm39139870pfi.94.2017.01.31.01.36.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jan 2017 01:36:08 -0800 (PST) From: Tino Calancha X-Google-Original-From: Tino Calancha Date: Tue, 31 Jan 2017 18:35:34 +0900 (JST) X-X-Sender: calancha@calancha-pc To: Tino Calancha Subject: Re: bug#5302: Diff-mode fails on Bzr diffs In-Reply-To: <877f5bwqjz.fsf@calancha-pc> Message-ID: References: <877f5bwqjz.fsf@calancha-pc> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: 5302 Cc: 5302@debbugs.gnu.org, 9597@debbugs.gnu.org, Eli Zaretskii , Dima Kogan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 31 11:52:45 2017 Received: (at 5302) by debbugs.gnu.org; 31 Jan 2017 16:52:45 +0000 Received: from localhost ([127.0.0.1]:52465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYbfh-0001LG-4h for submit@debbugs.gnu.org; Tue, 31 Jan 2017 11:52:45 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:37001) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYbfg-0001L5-5g; Tue, 31 Jan 2017 11:52:44 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 53CAC237AF; Tue, 31 Jan 2017 11:52:40 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Tue, 31 Jan 2017 11:52:40 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=secretsauce.net; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=AuO aIX5ieN77PEJvHr6HIvCr1G0=; b=hODhWjpPZNZQJd+OGHPTBBK+jAXeHkjTtMB Xx8K2ygqENRCbUHHQTC4/igoCC0b46CWj8Ws+D8+2fhSYS8KTDKDAjrwnFbq25kb gB2iwN5zTXb0pbqu9r2DA/26pRNIu4NP3/I1tWAqwTyQ9uWgP8CPY5xgH1ZEsbEn w6/i5YbM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= smtpout; bh=AuOaIX5ieN77PEJvHr6HIvCr1G0=; b=PlbJ6fzQIMnztvqlgghY ieiXvMOPaGbe9ESu/DQr2wkkCvhd56vbHHOMl96et57HuBOM41GVb4g21P6NPVuJ C2R+N5DWMEgW/CsnQ4t3hv0owDIMES94BH+KSeWNbbcEd6uJEiow9E6tfW/mXgKh t2m4IbB1ijfur+mIrCyvGDM= X-ME-Sender: X-Sasl-enc: cIXXItA/eQdA05hDHr6ftTu2xhrnoP/widV8zKPV26Gd 1485881559 Received: from [22.161.138.38] (unknown [172.56.38.235]) by mail.messagingengine.com (Postfix) with ESMTPA id 172A87E033; Tue, 31 Jan 2017 11:52:38 -0500 (EST) User-Agent: K-9 Mail for Android In-Reply-To: References: <877f5bwqjz.fsf@calancha-pc> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Subject: Re: bug#5302: Diff-mode fails on Bzr diffs From: Dima Kogan Date: Tue, 31 Jan 2017 08:52:32 -0800 To: Tino Calancha Message-ID: X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 5302 Cc: 5302@debbugs.gnu.org, 9597@debbugs.gnu.org, Eli Zaretskii X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) 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. From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 31 11:55:27 2017 Received: (at 5302) by debbugs.gnu.org; 31 Jan 2017 16:55:27 +0000 Received: from localhost ([127.0.0.1]:52474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYbiJ-0001PY-0K for submit@debbugs.gnu.org; Tue, 31 Jan 2017 11:55:27 -0500 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 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) 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) Subject: Re: bug#5302: Diff-mode fails on Bzr diffs To: Dima Kogan References: <877f5bwqjz.fsf@calancha-pc> From: Tino Calancha Message-ID: Date: Wed, 1 Feb 2017 01:55:16 +0900 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: 5302 Cc: 5302@debbugs.gnu.org, 9597@debbugs.gnu.org, Eli Zaretskii X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.1 (-) 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. From unknown Mon Jun 16 23:47:10 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 01 Mar 2017 12:24:03 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator