From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: The concurrency branch Date: Thu, 05 Jul 2012 12:07:29 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1341504460 21463 80.91.229.3 (5 Jul 2012 16:07:40 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 5 Jul 2012 16:07:40 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 05 18:07:38 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Smoag-0000Oo-Jy for ged-emacs-devel@m.gmane.org; Thu, 05 Jul 2012 18:07:38 +0200 Original-Received: from localhost ([::1]:55674 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Smoaf-0003t1-In for ged-emacs-devel@m.gmane.org; Thu, 05 Jul 2012 12:07:37 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:57102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Smoac-0003sS-JC for emacs-devel@gnu.org; Thu, 05 Jul 2012 12:07:35 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Smoaa-0004bR-E3 for emacs-devel@gnu.org; Thu, 05 Jul 2012 12:07:34 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:35800) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Smoaa-0004bD-9c for emacs-devel@gnu.org; Thu, 05 Jul 2012 12:07:32 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0EAG6Zu09MCoRT/2dsb2JhbABEtBGBCIIVAQEEAVYjEAs0EhQYDSSIHAW6CZBEA6MzgViDBQ X-IronPort-AV: E=Sophos;i="4.75,637,1330923600"; d="scan'208";a="192748479" Original-Received: from 76-10-132-83.dsl.teksavvy.com (HELO pastel.home) ([76.10.132.83]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 05 Jul 2012 12:07:30 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id AFF1B592B3; Thu, 5 Jul 2012 12:07:29 -0400 (EDT) In-Reply-To: (Andreas Schwab's message of "Thu, 05 Jul 2012 10:17:21 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.182 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:151437 Archived-At: >>> 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