From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: ludo@gnu.org (Ludovic =?iso-8859-1?Q?Court=E8s?=) Newsgroups: gmane.lisp.guile.devel Subject: Re: GUILE_MAX_HEAP_SIZE Date: Wed, 10 Sep 2008 09:38:11 +0200 Message-ID: <87ej3slacc.fsf@gnu.org> References: <87ej4tmf4m.fsf@gnu.org> <87d4k7e0s8.fsf@gnu.org> <87hc9iwyxi.fsf@gnu.org> <878wuus5fc.fsf@gnu.org> <87abf9qffj.fsf@gnu.org> <87od3musff.fsf@gnu.org> <87iqtsevl0.fsf@gnu.org> <87d4jdavsm.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1221032317 1059 80.91.229.12 (10 Sep 2008 07:38:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 10 Sep 2008 07:38:37 +0000 (UTC) To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Wed Sep 10 09:39:33 2008 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1KdKIW-0008No-DU for guile-devel@m.gmane.org; Wed, 10 Sep 2008 09:39:32 +0200 Original-Received: from localhost ([127.0.0.1]:34097 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KdKHW-0005Or-C5 for guile-devel@m.gmane.org; Wed, 10 Sep 2008 03:38:30 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KdKHQ-0005OV-5R for guile-devel@gnu.org; Wed, 10 Sep 2008 03:38:24 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KdKHO-0005OC-IL for guile-devel@gnu.org; Wed, 10 Sep 2008 03:38:23 -0400 Original-Received: from [199.232.76.173] (port=36188 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KdKHO-0005O2-DD for guile-devel@gnu.org; Wed, 10 Sep 2008 03:38:22 -0400 Original-Received: from mx20.gnu.org ([199.232.41.8]:41091) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KdKHN-0001Yq-QO for guile-devel@gnu.org; Wed, 10 Sep 2008 03:38:22 -0400 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KdKHN-0005hH-2W for guile-devel@gnu.org; Wed, 10 Sep 2008 03:38:21 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1KdKHM-00052F-0T for guile-devel@gnu.org; Wed, 10 Sep 2008 07:38:20 +0000 Original-Received: from 193.50.110.60 ([193.50.110.60]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 10 Sep 2008 07:38:20 +0000 Original-Received: from ludo by 193.50.110.60 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 10 Sep 2008 07:38:20 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 26 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 193.50.110.60 X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 25 Fructidor an 216 de la =?iso-8859-1?Q?R=E9volutio?= =?iso-8859-1?Q?n?= X-PGP-Key-ID: 0xEA52ECF4 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 821D 815D 902A 7EAB 5CEE D120 7FBA 3D4F EB1F 5364 X-OS: i686-pc-linux-gnu User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.3 (gnu/linux) Cancel-Lock: sha1:qS+ndmUtc0EbZCTKmx0kE/dHJmA= X-detected-kernel: by mx20.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:7658 Archived-At: Han-Wen Nienhuys writes: > commit 53f4876abcebf3f05d2a88bba3a898ddcda25a74 > Merge: 69f2317... 242ebea... > Author: Ludovic Courtès > Date: Tue Sep 9 22:03:42 2008 +0200 > > Merge branch 'master' into strftime-gnulib > > Conflicts: > libguile/ChangeLog > srfi/ChangeLog > test-suite/ChangeLog > > > I thought we were supposed to keep the history linear; did I > miss something? No, *I* did. Strange, I didn't notice it in "git whatchanged", and I don't get why there were conflicts in the first place since said files were left untouched... Thanks, Ludo'.