From: Andreas Schwab <schwab@linux-m68k.org>
To: emacs-devel@gnu.org
Subject: Re: The concurrency branch
Date: Thu, 05 Jul 2012 10:17:21 +0200 [thread overview]
Message-ID: <m2txxmmxke.fsf@igel.home> (raw)
In-Reply-To: <m262a26e5r.fsf@newartisans.com> (John Wiegley's message of "Wed, 04 Jul 2012 23:10:56 -0500")
"John Wiegley" <johnw@newartisans.com> writes:
>>>>>> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>
>> Could someone look into bringing the concurrency branch up-to-date with
>> trunk? A simple "merge" won't do, since many things have changed in the
>> code in that area (e.g. split Lisp_Fwd from Lisp_Misc).
>
> I gave it a try here with Git, but the number of conflicts was huge, and I
> didn't have enough background with the code to resolve them intelligently.
It doesn't make much sense to do a merge, it probably needs to be
restarted from scratch.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2012-07-05 8:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <m2ipe4una7.fsf@newartisans.com>
2012-07-04 12:34 ` The concurrency branch Stefan Monnier
2012-07-05 4:10 ` John Wiegley
2012-07-05 8:17 ` Andreas Schwab [this message]
2012-07-05 16:07 ` Stefan Monnier
2012-07-06 14:23 ` Tom Tromey
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/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2txxmmxke.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=emacs-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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
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).