From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bastien Newsgroups: gmane.emacs.devel Subject: Emacs 24.2 merge window (was: Merging CEDET) Date: Sat, 28 Jul 2012 17:38:24 +0200 Organization: GNU Message-ID: <87d33f3ngv.fsf_-_@gnu.org> References: <87396ecfyr.fsf@gnu.org> <4FCB6B01.8020600@siege-engine.com> <87aa0kp962.fsf@engster.org> <87r4rvrjew.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1343489875 9417 80.91.229.3 (28 Jul 2012 15:37:55 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 28 Jul 2012 15:37:55 +0000 (UTC) Cc: "Eric M. Ludlam" , =?iso-8859-1?Q?Llu=EDs?= , David Engster , emacs-devel@gnu.org To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jul 28 17:37:55 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 1Sv95V-0006gX-QY for ged-emacs-devel@m.gmane.org; Sat, 28 Jul 2012 17:37:53 +0200 Original-Received: from localhost ([::1]:34795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sv95V-0005l5-7Y for ged-emacs-devel@m.gmane.org; Sat, 28 Jul 2012 11:37:53 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:60432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sv95T-0005kz-O5 for emacs-devel@gnu.org; Sat, 28 Jul 2012 11:37:52 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sv95S-0003Tt-Tz for emacs-devel@gnu.org; Sat, 28 Jul 2012 11:37:51 -0400 Original-Received: from mail-we0-f169.google.com ([74.125.82.169]:34268) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sv95R-0003TX-Ez; Sat, 28 Jul 2012 11:37:49 -0400 Original-Received: by weys10 with SMTP id s10so3006056wey.0 for ; Sat, 28 Jul 2012 08:37:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=sender:from:to:cc:subject:in-reply-to:organization:references :user-agent:date:message-id:mime-version:content-type; bh=g5HdUW39xG64n4kB0kF1hBOkY0OvEI6jv0HFw3FVTF4=; b=pV6oWAgIg6xqiwNNsHNSPyaufAS6tvYbG9toFzQguwV5o+YC4iwJ2UdgMJq5cZIn+Y xmShxt2ITM4yTiChFSZ/oU1nJZPTalUEtcmQJUXIp40FdoOVTqxv5serjqcQkYaSur2j 4j8gP1qrguSI14gx3vdnMQj0x7awJD41BGGYa6VP5G9Vf364JzZzfhiZCSb2OjRcsAvx 0WJ5g06pEmbeiMXpKW0UffXwWuBEA0sjrAfxN/k9dHI3F8zsKVFDosB1mV27i+QJ8rKp WNd5/Mb6lN3nHhf4JD5DbzctthxWhA3bciOSzdh2v9WeMElcnvlRiIMsJKjzdJltb6d3 //Kw== Original-Received: by 10.216.242.204 with SMTP id i54mr2717359wer.99.1343489868338; Sat, 28 Jul 2012 08:37:48 -0700 (PDT) Original-Received: from myhost.localdomain (mar75-2-81-56-68-112.fbx.proxad.net. [81.56.68.112]) by mx.google.com with ESMTPS id cl8sm4971271wib.10.2012.07.28.08.37.46 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 28 Jul 2012 08:37:47 -0700 (PDT) Original-Received: by myhost.localdomain (Postfix, from userid 1000) id 588C38207; Sat, 28 Jul 2012 17:38:25 +0200 (CEST) In-Reply-To: <87r4rvrjew.fsf@gnu.org> (Chong Yidong's message of "Sat, 28 Jul 2012 23:32:07 +0800") User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.1.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.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:151937 Archived-At: Chong Yidong writes: > David Engster writes: > >> As I've already written some time ago, I've started to write a special >> package for merging Emacs<->CEDET. The most important goal is to keep >> the granularity of commits in both repositories. > > Any progress on this? It would be a shame for the CEDET merge to miss > the 24.2 merge window. Btw, any hint on when the Emacs 24.2 merge window ends? I will release Org 7.9 somewhere next week and I plan to merge it to Emacs trunk one week after that. Hopefully this will make it. Thanks, -- Bastien