From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: My bzr diff output for Emacs is now 6 MB Date: Wed, 02 Feb 2011 11:08:48 -0500 Message-ID: References: <83fws7ccce.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1296673533 32327 80.91.229.12 (2 Feb 2011 19:05:33 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 2 Feb 2011 19:05:33 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Lennart Borgman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Feb 02 20:05:29 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Pkhyn-0007qh-Lj for ged-emacs-devel@m.gmane.org; Wed, 02 Feb 2011 20:05:25 +0100 Original-Received: from localhost ([127.0.0.1]:44534 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pkhyh-0005PA-BC for ged-emacs-devel@m.gmane.org; Wed, 02 Feb 2011 14:02:55 -0500 Original-Received: from [140.186.70.92] (port=34485 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PkfGH-0002F0-CA for emacs-devel@gnu.org; Wed, 02 Feb 2011 11:08:54 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PkfGG-0002W6-FS for emacs-devel@gnu.org; Wed, 02 Feb 2011 11:08:53 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:18217 helo=ironport2-out.pppoe.ca) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PkfGE-0002Vd-Cd; Wed, 02 Feb 2011 11:08:50 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvsEAC8QSU1FpYAW/2dsb2JhbAClGHS8HoVTBIR4jxQ X-IronPort-AV: E=Sophos;i="4.60,414,1291611600"; d="scan'208";a="90265704" Original-Received: from 69-165-128-22.dsl.teksavvy.com (HELO ceviche.home) ([69.165.128.22]) by ironport2-out.pppoe.ca with ESMTP/TLS/ADH-AES256-SHA; 02 Feb 2011 11:08:49 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id EFC6C660DC; Wed, 2 Feb 2011 11:08:48 -0500 (EST) In-Reply-To: (Lennart Borgman's message of "Wed, 2 Feb 2011 13:27:59 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.183 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:135479 Archived-At: > I did not save this one, but I have an old output from bzr diff from > 2010-12-29 which is 6 MB. The diff is done after the merge and against > the checked out trunk. You probably didn't do the diff you thought you were doing. A common case for is to do the diff before committing: Bzr stupidly ignores the pending merges when computing the ancestry, so a "diff -rsubmit:" applied after a merge but before the corresponding commit will show misleading results. > Unfortunately the bzr diff output does not contain any details about > what revisions was diffed. (Is not that a big omitting?) IIRC I filed a bug about that (or added to a pre-existing bug about that) a few years ago. Please look for that bug and add your voice to it. Stefan