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: Wed, 2 Feb 2011 13:27:59 +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 1296657707 5215 80.91.229.12 (2 Feb 2011 14:41:47 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 2 Feb 2011 14:41:47 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Feb 02 15:41:41 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 1Pkdto-0007Ht-3T for ged-emacs-devel@m.gmane.org; Wed, 02 Feb 2011 15:41:36 +0100 Original-Received: from localhost ([127.0.0.1]:59402 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pkdtn-0006Or-RV for ged-emacs-devel@m.gmane.org; Wed, 02 Feb 2011 09:41:35 -0500 Original-Received: from [140.186.70.92] (port=54528 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PkdhT-0003WR-Ml for emacs-devel@gnu.org; Wed, 02 Feb 2011 09:28:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PkbpD-0003Qu-Mk for emacs-devel@gnu.org; Wed, 02 Feb 2011 07:28:44 -0500 Original-Received: from mail-ey0-f169.google.com ([209.85.215.169]:52711) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PkbpC-0003Bn-3n; Wed, 02 Feb 2011 07:28:42 -0500 Original-Received: by eyh6 with SMTP id 6so3591315eyh.0 for ; Wed, 02 Feb 2011 04:28:20 -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=umkARR339Hn8PkLHlEaQuxxOkjQE+lfgqIMXah/olME=; b=qXVU4uaVqrdNBWdZfU+RNQQM3iUPk7koNexTYwHF1M1IrSlko1nmVwTW0h7kkszmFO 8joLedGESRGAmZikERqrtYIcJYM5asWd6C1ExxWvHKVdk+2aZJug6aRpqJrkvnPmfbZ6 rKzGI/ZUJsXtrWM2fY40D7iwbGZ3yUn51XQiI= 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=qhsgityGsMaEzVUKf6ox+FBpKqqka9+oDH4pUHc1ez4pzhjAldDkt0BF5JGJdYj/aZ 9oZmSZHltZ24yBVvkiE9GcZ0ahembArO88JRwYQlPHyNP1d8Te3JAeFnOawPz+Qgv6yL XJ6mwAsYkGdYv4HvDREuWxllRpD51hvwfep4U= Original-Received: by 10.213.29.77 with SMTP id p13mr11711812ebc.2.1296649699884; Wed, 02 Feb 2011 04:28:19 -0800 (PST) Original-Received: by 10.213.36.11 with HTTP; Wed, 2 Feb 2011 04:27:59 -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:135458 Archived-At: On Wed, Feb 2, 2011 at 1:06 PM, Eli Zaretskii wrote: >> From: Lennart Borgman >> Date: Wed, 2 Feb 2011 05:07:12 +0100 >> Cc: emacs-devel@gnu.org >> >> On Wed, Feb 2, 2011 at 5:03 AM, Eli Zaretskii wrote: >> >> From: Lennart Borgman >> >> Date: Wed, 2 Feb 2011 04:40:32 +0100 >> >> >> >> It looks like bzr failed to merge date changes etc. >> > >> > What do you mean by "merging date changes"? >> >> >> The only difference I saw in several files where the date changes in >> the headers. > > What do you mean by "headers"? It was those lines that differed for every file: ;; Copyright (C) 2004-2011 Free Software Foundation, Inc. But that was probably not all. >> However now - after a new checkout - things seems back to normal. It >> looks like bzr needs several turns sometimes to do the job. > > That'd be news to me. =C2=A0But it's hard to say anything intelligent > without seeing at least one instance of these "failed merges". 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. Unfortunately the bzr diff output does not contain any details about what revisions was diffed. (Is not that a big omitting?)