[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: The concurrency branch
|
From: |
Andreas Schwab |
|
Subject: |
Re: The concurrency branch |
|
Date: |
Thu, 05 Jul 2012 10:17:21 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) |
"John Wiegley" <address@hidden> writes:
>>>>>> Stefan Monnier <address@hidden> 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, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."