From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: The concurrency branch Date: Thu, 05 Jul 2012 10:17:21 +0200 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1341476261 16778 80.91.229.3 (5 Jul 2012 08:17:41 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 5 Jul 2012 08:17:41 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 05 10:17:41 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 1SmhFs-0005Pu-JR for ged-emacs-devel@m.gmane.org; Thu, 05 Jul 2012 10:17:40 +0200 Original-Received: from localhost ([::1]:35084 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmhFr-0000bf-DL for ged-emacs-devel@m.gmane.org; Thu, 05 Jul 2012 04:17:39 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:56084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmhFl-0000b9-Ek for emacs-devel@gnu.org; Thu, 05 Jul 2012 04:17:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SmhFg-0008FT-Nq for emacs-devel@gnu.org; Thu, 05 Jul 2012 04:17:33 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.10]:55000) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmhFg-0008FC-HP for emacs-devel@gnu.org; Thu, 05 Jul 2012 04:17:28 -0400 Original-Received: from frontend4.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3WSX4r1CQjz3hj7X for ; Thu, 5 Jul 2012 10:18:03 +0200 (CEST) Original-Received: from igel.home (ppp-88-217-102-88.dynamic.mnet-online.de [88.217.102.88]) by mail.mnet-online.de (Postfix) with ESMTPA id 3WSX423XmNzbcL1 for ; Thu, 5 Jul 2012 10:17:22 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 501) id 0547ACA2A2; Thu, 5 Jul 2012 10:17:21 +0200 (CEST) X-Yow: Why are these athletic shoe salesmen following me?? In-Reply-To: (John Wiegley's message of "Wed, 04 Jul 2012 23:10:56 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 212.18.0.10 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:151433 Archived-At: "John Wiegley" writes: >>>>>> Stefan Monnier 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."