From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?UTF-8?B?TGx1w61z?= Newsgroups: gmane.emacs.devel Subject: Re: CEDET sync Date: Fri, 04 Jun 2010 21:53:14 +0200 Message-ID: <86d3w660d1.wl%lluis@ginnungagap.pc.ac.upc.edu> References: <20100603153729.GD2763@loria.fr> <87ocfsvxrl.fsf@stupidchicken.com> <4C094A28.6070008@siege-engine.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Trace: dough.gmane.org 1275682463 11617 80.91.229.12 (4 Jun 2010 20:14:23 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 4 Jun 2010 20:14:23 +0000 (UTC) Cc: Stefan Monnier , emacs-devel@gnu.org To: "Eric M. Ludlam" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jun 04 22:14:22 2010 connect(): No such file or directory 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 1OKdH2-0006XH-TX for ged-emacs-devel@m.gmane.org; Fri, 04 Jun 2010 22:14:21 +0200 Original-Received: from localhost ([127.0.0.1]:49683 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKdGk-0001YZ-Ub for ged-emacs-devel@m.gmane.org; Fri, 04 Jun 2010 16:13:31 -0400 Original-Received: from [140.186.70.92] (port=58597 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKd5V-0003js-0a for emacs-devel@gnu.org; Fri, 04 Jun 2010 16:01:58 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKcxR-0002in-BY for emacs-devel@gnu.org; Fri, 04 Jun 2010 15:53:38 -0400 Original-Received: from mail.gmx.net ([213.165.64.20]:59229) by eggs.gnu.org with smtp (Exim 4.69) (envelope-from ) id 1OKcxQ-0002i9-Vp for emacs-devel@gnu.org; Fri, 04 Jun 2010 15:53:33 -0400 Original-Received: (qmail invoked by alias); 04 Jun 2010 19:53:30 -0000 Original-Received: from gw.ac.upc.es (EHLO localhost) [147.83.30.3] by mail.gmx.net (mp047) with SMTP; 04 Jun 2010 21:53:30 +0200 X-Authenticated: #12333383 X-Provags-ID: V01U2FsdGVkX19Xf+0SYTBXF8XB6Ak263NcVG+kktm8imv5ZRLAgx EBhmYER13SLMHJ In-Reply-To: <4C094A28.6070008@siege-engine.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/24.0.50 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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:125527 Archived-At: >>> Could you take a look at this report about a symbol that Semantic can't >>> handle? I just applied your semantic-lex-spp-table-write-slot-value >>> change that saves a nil instead of erroring on invalid values. >> >> BTW Eric, but it seems that Emacs's CEDET code and your own aren't being >> sync'ed at all, is that right? If so, we really need to get this syncing >> going ASAP, otherwise it will be hellish to maintain. > If someone who knows some about dvcs systems I can use on Source Forge > that would aid in such a sync system would like to help me set things > up, that would be a huge boon for me! Problem is, I didn't see a clear and hassle-free path to do cross-project merging in the long term (I didn't ask the GNUS people about their strategy). Right now I don't have much time to start playing with different VCS and cross-merging strategies (I'm only proficient with subversion), but if any of you come up with something that that would work with minimal user intervention I'd be glad to start a new CEDET branch in such a scenario. The first step I could do is renaming files, which is the major showstopper right now. Then the real cross-merging could start, which I don't know if I would have time to do. As I understood it, the most viable cross-merging strategy would be: emacs cedet |- trunk |- trunk \- \- branch-emacs- Valid merging flows: cedet::* <-> cedet::* emacs::* <-> emacs::* emacs::trunk/lisp/cedet <- cedet::emacs-trunk emacs::/lisp/cedet <- cedet::emacs- My concern with such a scheme is how (*) to transplant changes from cedet into an emacs subdirectory, such that all cedet commit logs and dates are maintained. (*) which VCS can be used and which restrictions might this impose on the development workflow Thanks, 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