From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "John Wiegley" Newsgroups: gmane.emacs.devel Subject: Re: The concurrency branch Date: Wed, 04 Jul 2012 23:10:56 -0500 Organization: New Artisans LLC Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1341461469 31886 80.91.229.3 (5 Jul 2012 04:11:09 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 5 Jul 2012 04:11:09 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 05 06:11:09 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 1SmdPG-0006jM-O3 for ged-emacs-devel@m.gmane.org; Thu, 05 Jul 2012 06:11:06 +0200 Original-Received: from localhost ([::1]:52724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmdPF-0002Jm-Ed for ged-emacs-devel@m.gmane.org; Thu, 05 Jul 2012 00:11:05 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:43202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmdPC-0002Jd-Ft for emacs-devel@gnu.org; Thu, 05 Jul 2012 00:11:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SmdPA-0007mY-QM for emacs-devel@gnu.org; Thu, 05 Jul 2012 00:11:01 -0400 Original-Received: from mail-yx0-f169.google.com ([209.85.213.169]:43016) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmdPA-0007mN-Jb for emacs-devel@gnu.org; Thu, 05 Jul 2012 00:11:00 -0400 Original-Received: by yenr5 with SMTP id r5so8173916yen.0 for ; Wed, 04 Jul 2012 21:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:organization:references:mail-followup-to :date:in-reply-to:message-id:user-agent:mime-version:content-type; bh=nZwDvJGSF1Zx5bs1lYJDoMdrXSh/BjZ7qx7+P7ix9YE=; b=tYOQVrJuOhYYrzspSP9JmuEZHFXOGwyayTu1u9V03mn2uIyfchg7LJ42uZelpvl30j DEPXVNjw5MQTx8wHjVsB0YY+rJLs0v5F579OdBeh9ppkw0KU4olFVg+JGomxgrGmBYpi a6FlQE8UuH5WmfyOziqAm6Ah9hkFs8LOUDl+ivQ03Z6NHM75AzjZJEPofc2fY97UtL/L ZhzSoLk4VJLCF388/gn74y55MSVjcFkGy2hOlJuT3EyWUOpTDcB/n1o8q8Wl+E5Z9Cqa f9VK89baHZmvnFBLAyEVl04jmrKgFBCjxVE7f4CN67is/i6HhL96XophnFovBS7VNNjV 4ddQ== Original-Received: by 10.50.186.131 with SMTP id fk3mr12767846igc.31.1341461458735; Wed, 04 Jul 2012 21:10:58 -0700 (PDT) Original-Received: from Hermes.local (71-82-213-197.dhcp.mdsn.wi.charter.com. [71.82.213.197]) by mx.google.com with ESMTPS id ay5sm1371000igb.15.2012.07.04.21.10.57 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 04 Jul 2012 21:10:58 -0700 (PDT) Original-Received: by Hermes.local (Postfix, from userid 501) id 0595420CC747; Wed, 4 Jul 2012 23:10:57 -0500 (CDT) Mail-Followup-To: emacs-devel@gnu.org In-Reply-To: (Stefan Monnier's message of "Wed, 04 Jul 2012 08:34:55 -0400") User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.1 (darwin) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.213.169 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:151429 Archived-At: >>>>> 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. John