From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lennart Borgman Newsgroups: gmane.emacs.devel Subject: Re: My bzr diff output for Emacs is now 6 MB Date: Thu, 3 Feb 2011 19:28:13 +0100 Message-ID: References: <83fws7ccce.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1296757870 28955 80.91.229.12 (3 Feb 2011 18:31:10 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 3 Feb 2011 18:31:10 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Feb 03 19:31:06 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 1Pl3xR-0008QT-11 for ged-emacs-devel@m.gmane.org; Thu, 03 Feb 2011 19:31:05 +0100 Original-Received: from localhost ([127.0.0.1]:34693 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl3xQ-00054y-6K for ged-emacs-devel@m.gmane.org; Thu, 03 Feb 2011 13:31:04 -0500 Original-Received: from [140.186.70.92] (port=43448 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl3v4-00042G-Lz for emacs-devel@gnu.org; Thu, 03 Feb 2011 13:28:42 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pl3v3-0006U0-GF for emacs-devel@gnu.org; Thu, 03 Feb 2011 13:28:38 -0500 Original-Received: from mail-ey0-f169.google.com ([209.85.215.169]:60811) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pl3v0-0006T3-NZ; Thu, 03 Feb 2011 13:28:34 -0500 Original-Received: by eyh6 with SMTP id 6so822505eyh.0 for ; Thu, 03 Feb 2011 10:28:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type:content-transfer-encoding; bh=Ze2sEQcyIzJHWHo1dxb122xEo+Ad4qB3G7Cy3mS2aMo=; b=SLks2RYWRh+0RZaDbMA3xsHWVXb/gO/ocGwle/sUOpa/bRfdLunY69u+rzU5rxLisF n8KGSqoklJ8119LaOd1bF7NQIV43VPs7uSJ4VBBfvSXPjj+X7R5he0OJG186t/WFA8BO ZCk/njR5EHSkxFQPVSr71E3Kh7TB59KxfDILM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=cg0udFBOE/OaaHJOpRKp/PjmPgXfG1x7OhGR8vMUet8VjDh8WHLqaaNPSS2pp8eBNX PLC5dMKlnVEf+6WXnsix/APE1yvMb+GBgrCJRWoe9HAxi1kRbkz9lUnbRg9GxDKzFesK 73cIhrChiGLu9tzoQmrrI7lJixScTJXPaEuiU= Original-Received: by 10.213.30.20 with SMTP id s20mr1809839ebc.15.1296757713474; Thu, 03 Feb 2011 10:28:33 -0800 (PST) Original-Received: by 10.213.13.20 with HTTP; Thu, 3 Feb 2011 10:28:13 -0800 (PST) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.215.169 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:135510 Archived-At: On Wed, Feb 2, 2011 at 5:08 PM, Stefan Monnier w= rote: >> 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. =C2=A0A commo= n > 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. Hm, I thought so, but I am using this for merging and the diff is done late= r: @setlocal @set DEVHOME=3Dbld @pushd %DEVHOME%\emacs\trunk bzr update @popd @pushd %DEVHOME%\emacs\emacsw32 bzr merge bzr commit -m "Merge from trunk" @popd >> 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. =C2=A0Please look for that bug and add your voice > to it. I will if you tell me how to find it.