From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: emacs-devel@gnu.org
Subject: Re: The concurrency branch
Date: Thu, 05 Jul 2012 12:07:29 -0400 [thread overview]
Message-ID: <jwvsjd6kxa9.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <m2txxmmxke.fsf@igel.home> (Andreas Schwab's message of "Thu, 05 Jul 2012 10:17:21 +0200")
>>> 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.
I believe the basic principle can be the same, but it does need to be
rewritten because the parts it touches have been substantially changed.
Stefan
next prev parent reply other threads:[~2012-07-05 16:07 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
2012-07-05 16:07 ` Stefan Monnier [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvsjd6kxa9.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=schwab@linux-m68k.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.