From: ludo@gnu.org (Ludovic Courtès)
To: guile-devel@gnu.org
Subject: Re: GUILE_MAX_HEAP_SIZE
Date: Wed, 10 Sep 2008 09:38:11 +0200 [thread overview]
Message-ID: <87ej3slacc.fsf@gnu.org> (raw)
In-Reply-To: ga7a3f$dqs$1@ger.gmane.org
Han-Wen Nienhuys <hanwen@xs4all.nl> writes:
> commit 53f4876abcebf3f05d2a88bba3a898ddcda25a74
> Merge: 69f2317... 242ebea...
> Author: Ludovic Courtès <ludo@gnu.org>
> 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'.
next prev parent reply other threads:[~2008-09-10 7:38 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-13 5:11 GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-13 9:35 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
2008-08-13 15:04 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-14 5:09 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-14 7:56 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
2008-08-16 19:13 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-16 19:24 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-17 21:51 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
2008-08-18 19:08 ` GUILE_MAX_HEAP_SIZE Andy Wingo
2008-08-21 20:27 ` Gnulib files now in the repository Ludovic Courtès
2008-08-16 0:43 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-16 0:47 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-17 22:26 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
2008-08-18 7:43 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
2008-08-18 14:18 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-18 14:31 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-18 15:34 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
2008-08-19 8:54 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-19 13:53 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
2008-08-19 15:46 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-21 18:36 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
2008-08-22 2:06 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-22 3:36 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-22 18:46 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
2008-09-09 20:50 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
2008-09-10 2:05 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-09-10 7:38 ` Ludovic Courtès [this message]
2008-08-22 2:29 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-22 7:39 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
2008-08-18 7:54 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
2008-08-18 14:10 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-18 15:48 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
2008-08-19 8:22 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-18 15:55 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
2008-08-19 8:10 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-19 8:16 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-19 23:03 ` GOOPS memory corruption in `go_to_hell ()' Ludovic Courtès
2008-08-19 9:00 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
2008-08-22 9:42 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
2008-08-22 22:32 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
2008-08-23 2:25 ` GUILE_MAX_HEAP_SIZE Han-Wen Nienhuys
-- strict thread matches above, loose matches on Subject: below --
2008-08-14 11:49 GUILE_MAX_HEAP_SIZE dsmich
2008-08-14 12:32 ` GUILE_MAX_HEAP_SIZE Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/guile/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ej3slacc.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=guile-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).