From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?Llu=C3=ADs?= Newsgroups: gmane.emacs.devel Subject: Re: State of the CEDET merge Date: Mon, 14 Mar 2011 21:08:42 +0100 Message-ID: <87oc5dv511.fsf@ginnungagap.bsc.es> References: <877hc7lzcc.fsf@fencepost.gnu.org> <8762rq7w7h.fsf@stupidchicken.com> <871v2en9n1.fsf@fencepost.gnu.org> <871v2eyece.fsf_-_@engster.org> <87r5ad91dm.fsf@ginnungagap.bsc.es> <87zkp1solk.fsf@fencepost.gnu.org> <87wrk54pzp.fsf@ginnungagap.bsc.es> <87tyf7aw9b.fsf@engster.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1300134514 12169 80.91.229.12 (14 Mar 2011 20:28:34 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 14 Mar 2011 20:28:34 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 14 21:28:30 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PzENL-0007VQ-EZ for ged-emacs-devel@m.gmane.org; Mon, 14 Mar 2011 21:28:23 +0100 Original-Received: from localhost ([127.0.0.1]:35837 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzE7m-0000yS-0L for ged-emacs-devel@m.gmane.org; Mon, 14 Mar 2011 16:12:18 -0400 Original-Received: from [140.186.70.92] (port=48668 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzE4V-0008Ub-6W for emacs-devel@gnu.org; Mon, 14 Mar 2011 16:09:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PzE4S-0003eS-KW for emacs-devel@gnu.org; Mon, 14 Mar 2011 16:08:53 -0400 Original-Received: from mailout-de.gmx.net ([213.165.64.22]:57322) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1PzE4R-0003eM-Pt for emacs-devel@gnu.org; Mon, 14 Mar 2011 16:08:52 -0400 Original-Received: (qmail invoked by alias); 14 Mar 2011 20:08:49 -0000 Original-Received: from unknown (EHLO localhost) [84.88.53.92] by mail.gmx.net (mp072) with SMTP; 14 Mar 2011 21:08:49 +0100 X-Authenticated: #12333383 X-Provags-ID: V01U2FsdGVkX1//ck92pPD/VpjI4b/9GcOr/+6Navp7s1D3Za1M/q xP6/GgnHV4KVZl In-Reply-To: <87tyf7aw9b.fsf@engster.org> (David Engster's message of "Sun, 13 Mar 2011 16:13:52 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 213.165.64.22 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:137225 Archived-At: David Engster writes: > Llu=C3=ADs writes: >> In fact, I'm only tracking changes introduced in Emacs. But not those >> introduced after my last merge for a specific file (these will have to >> be manually re-checked). >> >> Changes in the cedet trunk should be automatically merged when I merge >> the branch. > I must admit I don't fully understand the 'file-rename' branch, > especially at what point you would call this branch "finished". Could > you (very roughly) outline how you plan to merge the different versions > in the end? The initial process (the one is being used right now) was described on previous mails (see script crude-update in the file-rename branch). Once that's finished, according to previous discussions in this list: * freeze cedet-related changes in the emacs repository * see if new changes from emacs must be transplanted into cedet (these should be just a few) * merge file-rename into cedet's trunk * create a branch (to-emacs) in cedet for changes meant to go into cedet * any change in cedet that is ready for upstream emacs should be merged into the 'to-emacs' branch * _somehow_ move changes from 'to-emacs' into emacs proper (emacs can just have a file indicating the last revision in 'to-emacs' that was merged into it, and then applying a patch with the differences since that revision) This is all supposing that bazaar has no support for externals/sub-modules (as is the case right now AFAIK). [...] > It would help if you could name some concrete tasks which have to be > done next. I've seen the 'open_issues' file, but I don't really > understand those items listed there. There are two files to look into: * not_in_emacs Files that are present in the cedet repository but not in emacs. Some of these must be considered as "contrib" files (and thus stay out of emacs), while some of these may need to be added into emacs proper. * open_issues Things that must be revised before considering the file-rename done Some of these refer to functions that were introduced in cedet to support other emacs/xemacs versions. In the case of emacs, for example, they should probably be dropped, as emacs will already ship on each version a fully-compatible cedet from now on. If you want to use a newer cedet version, then you should probably use a new emacs version. > Please don't take these questions the wrong way; I very much > appreciate your work you've already done on the merge and the bzr > transition. If you're thinking that I might get angry about your comments, then I'm not taking these the wrong way :) Lluis -- "And it's much the same thing with knowledge, for whenever you learn something new, the whole world becomes that much richer." -- The Princess of Pure Reason, as told by Norton Juster in The Phantom Tollbooth