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 05:07:12 +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 X-Trace: dough.gmane.org 1296619667 21384 80.91.229.12 (2 Feb 2011 04:07:47 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 2 Feb 2011 04:07: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 05:07:43 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 1PkU0M-0006bo-FP for ged-emacs-devel@m.gmane.org; Wed, 02 Feb 2011 05:07:42 +0100 Original-Received: from localhost ([127.0.0.1]:36253 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PkU0L-0005uX-AC for ged-emacs-devel@m.gmane.org; Tue, 01 Feb 2011 23:07:41 -0500 Original-Received: from [140.186.70.92] (port=60253 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PkU0H-0005uG-92 for emacs-devel@gnu.org; Tue, 01 Feb 2011 23:07:38 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PkU0G-0007z3-5X for emacs-devel@gnu.org; Tue, 01 Feb 2011 23:07:37 -0500 Original-Received: from mail-ew0-f41.google.com ([209.85.215.41]:42902) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PkU0D-0007t9-Dj; Tue, 01 Feb 2011 23:07:33 -0500 Original-Received: by ewy27 with SMTP id 27so3393683ewy.0 for ; Tue, 01 Feb 2011 20:07:32 -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; bh=72kxWLIhXO1OkQqehZLCDuLcdSxOYYG+8tXqYlqIUVQ=; b=gXk1T1z8uxq6VoWrEuN2xB6RqeupOq9nW0JiPxQ3qD0rW/iBL8aM3sdYJsqPmHTWHj fzZLXtHCVqXFkwCpj6/3Kwv3X+Uays1c4ouT4p/2aZQjmNvZFEC/UdTDvgPa+OmhBOcf 6cMjAIm9rRsqLLppQgp3paxxiSXlO+XE8BMhE= 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; b=lXBBsGhDsdSfElqOMfw8nsEQ08Th+CtYb/Sh81MroQdWa0HWcQcovWbYSrKotQvq11 hebazRgUZHXLAPv8M5p6QtZLbMx27/8BP7boJpEnfjuJMGa2fMTQVG8zQ2jHlTxknw7M yidiXSqFeGB1BSqmgv517ijsPs9R+DKm8DmuI= Original-Received: by 10.213.30.20 with SMTP id s20mr11249124ebc.15.1296619652504; Tue, 01 Feb 2011 20:07:32 -0800 (PST) Original-Received: by 10.213.36.11 with HTTP; Tue, 1 Feb 2011 20:07:12 -0800 (PST) In-Reply-To: <83fws7ccce.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.215.41 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:135450 Archived-At: 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. However now - after a new checkout - things seems back to normal. It looks like bzr needs several turns sometimes to do the job. This was for my emacsw32 branch. There was no such problem for just the trunk checkout.